Code cleaning up
Merge pull request #328 from liuchuangww/user

Code cleaning up