Made matcher more readable

Also made it take in tutors and slots directly