improved whitespace