code refactoring
Merge pull request #2 from ktaras/chore/refactoring

code refactoring