refactor performed
Merge pull request #5 from btrofimov/btrofimov_refactor

refactor performed