small refactoring
Merge pull request #32 from mikeplavsky/master

Small Refactoring