modularized!
code cleanup
Merge pull request #3 from andrew-l-o/modularize

Modularize