Tidy and reformat