Comments addressed

Closes #1.
yeah, I don't think I like the way I did it either. Changing.