Restructured Lecture and removed HashCode & Equals