Code clean up
Merge pull request #469 from linzongshu/user

Code clean up