Whitespace, mostly (#6)