Added Refactors to UserController