Improved whitespace