update and reformat