matchers refactoring