Write comments & clean source codes to look nice
Merge branch 'master' into hongkun
adding comment little bit more