Some whitespace fixes