added stripping of whitespace