minor cleanup (whitespace/line lengths)