refactoring
refactoring
Merge pull request #46 from kashesandr/boilerplate/refactoring

refactoring