Refactor usersController