whitespace fixes to make the diffs nicer