cleanup
Merge pull request #11 from wendalynne/1446e44f85554f383987a7ea6c90a1f192d48ec5

code cleanup, yay