minor refactoring :)
Merge pull request #2 from shadchnev/master

minor refactoring :)