Almost entirely whitespace fixes