refactoring
Merge pull request #1 from soraphis/feature/refactor

refactoring