Reformat whitespace

Mostly