whitespace and line length cleanup