Cleanup.
Merge pull request #10 from thewillhuang/hiroshi

Cleanup.