Misc whitespace changes