Small code refactoring
Merge pull request #1 from dmazur/master

Small code refactoring