Refactor matchers from func to class