more refactors
Merge pull request #3 from chrisamoore/master

more refactors