further whitespace fixes