Various whitespace fixes