+ whitespace improvements