improved whitespace, line lengths