Review and reformat