- clean up and reformat