refactor
Merge pull request #1 from ivanoats/patch-1

refactor