refactoring: using client instead of auth_token