Cleaned up all code except Semester, Semester, and most of Course