code refactoring.
Merge pull request #1 from semochkin/master

code refactoring.