and more whitespace fixes