some refactorings in the course class