Cleaned UserController code