Comment clean-ups
Merge pull request #47 from fincoda/luyi/dev

Comment clean-ups