minor refactoring
Merge pull request #3 from zelgerj/master

minor refactoring