Several whitespace fixes