Project-wide reformat for easier merging