handle whitespace a bit better