Some whitespace improvements