Whitespace fix-ups