[Hoang Nguyen] Clean-up source code.
Merge pull request #23 from rheicide/clean-up-hoang

[Hoang Nguyen] Clean-up source code.