Whitespace and line length fixes to pass lint checks