More whitespace fixes