Whitespace and line length fixes