Improved: whitespace stripping