Put matcher in own class
Clarify action