Further improved whitespace