some refactorings
Merge pull request #6 from dirkschumacher/master

Course refactorings