Cleanup matcher and classifier interactions

* Some smells remain but it becomes cleaner now