minor refactor for matchers. thanks ofir!