Cleaned up code and prepped for assignment 5