changed whitespace handling