refactor
Merge pull request #49 from forumbyr/master

just refactor