Removed todo
Refactored UserController.