Worked on refactoring matchups model