fixed bug in user controller, clenaup in user model