Normalize mentors again

- Grouping mentors by company