Removed useless code
Refactored Listener definition
Added course model