Minor whitespace improvements