reformat for better diffs/comments