Misc whitespace fixes + formatting