whitespace improvements