A large amount of code cleanup. Also fixed some Course methods that seemed to be pointing at incorrect variables.