userService refactoring