refactoring
Merge pull request #18 from johnny-miyake/refactoring

refactoring