refactor usersvc