Reformat for easier diffing on branches