Adding whitespace stripping as well.