Fix for stripping whitespace and comments