refactoring
Merge pull request #9 from twokul/refactoring4

refactoring