added stripping of white space from comment matching