Clean-up and documentation
Support for new course object structure.