refactoring: moved matcher to utils class