Improved whitespace consistency