Refactoring
Merge pull request #12 from dzdidi/refactoring

Refactoring