Clean up code
Merge pull request #22 from gooichi/hotfix-5349e0a

Clean up code