Start refactoring mentor/mentee matching