Reformat for better diffing