Refactor enrollments