Reformat and tidy