Whitespace improvements