Added whitespace stripping