Fix some annoying/inconsistent whitespace