refactor again.
Merge pull request #2 from masa21kik/refactor

refactor again.