Mostly whitespace fixes