Better whitespace stripping