Refactoring.
Merge pull request #1 from S-Gr4y/master

Refactoring.