Code comments + cleanup following last commit
Merge pull request #10 from fincoda/luyi/dev

Code comments + cleanup following last commit