Changes from code review
Simplify matcher-project