whitespace/line-length cleanup