Refactor the CourseList