Reformat, to ease future diffs