Prepare code for review
541