Various whitespace fixes
More minor whitespace changes