Various cleanup and extra comments. Final commit for Project 2