Changes for Homework 6/4/14

Cleaned up the code up a little to make it work better and have better
style.