Part 1 complete
Cleaned up some code.