Misc whitespace clean up