code clean up
Merge pull request #125 from jeremyletang/clean-code

code clean up