replaced 'encoding' for 'identifier' in class name feature testing for consistence, added missing space and other formatting changes, removed unneeded comment
replaced 'encoding' for 'identifier' in class name feature testing for consistence, added missing space and other formatting changes, removed unneeded comment

dperini/nwmatcher,dperini/nwmatcher,dperini/nwmatcher