refactored
Merge pull request #1 from dunnololda/master

Refactoring for Gleb