Refactoring CourseManager