do more refactor for course.
do more refactor for course.