refactoring - partial
Merge pull request #3 from KirillMachuhin/refactoring

refactoring - partial