matchers slight refactoring [2nd try]