clean up unused comment
rename some variables
Merge pull request #30 from victorleungtw/master

Rename some variables and remove unused comments