Refactoring =^_^=
Refactoring =^_._^=
Merge pull request #3 from alinadubatovka/master

Refactoring =^_._^=