Improved 'whitespaces' section