More minor whitespace changes