refactoring
Merge pull request #47 from kashesandr/distribution/refactoring

refactoring