Refactored userService with