Moved NoDiffIndicator into its own class
Cleaning up Matchers public methods