Roy|6|Small refactorings
Roy|13|Added course event listener