more whitespace improvements