matchers slight refactoring