Homework 2 seemingly complete. Cleaned up code.