Remove debug/todo comments and shorten lines
Merge pull request #8 from wangkuiyi/rm_debug

Remove debug/todo comments and shorten lines