minor refactoring
Merge pull request #9 from AndyFTW/master

minor refactoring