Some comments and code cleanup
More comments and code cleanup
Merge pull request #4 from fincoda/luyi/dev

Luyi/dev