Improved whitespace usage