Better handling of whitespace