Improved handling of white space