refactoring
Merge pull request #15 from eugenekorpan/refactoring

refactoring