@@ -3,7 +3,7 @@
 import time
 
 import onepasswordconnectsdk
-from onepasswordconnectsdk.models import (ItemVault, Field, GeneratorRecipe)
+from onepasswordconnectsdk.models import Field, GeneratorRecipe, Item
 
 op_connect_token = os.environ["OP_CONNECT_TOKEN"]
 default_vault = os.environ["OP_VAULT"]
@@ -17,7 +17,7 @@
 print(steps.steps["step1"])
 
 # CREATE A NEW ITEM
-username_item = onepasswordconnectsdk.models.Item(
+username_item = Item(
     title="Secret String",
     category="LOGIN",
     tags=["1password-connect"],
 
@@ -1,8 +1,15 @@
-# coding: utf-8
-
-# flake8: noqa
-
+from onepasswordconnectsdk import client
+from onepasswordconnectsdk import models
 from onepasswordconnectsdk.config import load
 from onepasswordconnectsdk.config import load_dict
 from onepasswordconnectsdk.client import new_client
 from onepasswordconnectsdk.client import new_client_from_environment
+
+__all__ = [
+    "client",
+    "load",
+    "load_dict",
+    "models",
+    "new_client",
+    "new_client_from_environment"
+]
@@ -3,7 +3,6 @@
 from typing import List, Dict
 from onepasswordconnectsdk.client import Client
 from onepasswordconnectsdk.models import (
-    SummaryItem,
     Item,
     ParsedField,
     ParsedItem,
 
@@ -1,10 +1,3 @@
-# coding: utf-8
-
-# flake8: noqa
-
-
-from __future__ import absolute_import
-
 # import models into model package
 from onepasswordconnectsdk.models.error import Error
 from onepasswordconnectsdk.models.item import Item
@@ -20,3 +13,20 @@
 from onepasswordconnectsdk.models.parsed_field import ParsedField
 from onepasswordconnectsdk.models.parsed_item import ParsedItem
 from onepasswordconnectsdk.models.vault import Vault
+
+__all__ = [
+    "Error",
+    "Field",
+    "FieldSection",
+    "File",
+    "GeneratorRecipe",
+    "Item",
+    "ItemDetails",
+    "ItemUrls",
+    "ItemVault",
+    "ParsedField",
+    "ParsedItem",
+    "Section",
+    "SummaryItem",
+    "Vault",
+]
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     1Password Connect
 
@@ -11,10 +9,9 @@
 
 
 import pprint
-import re  # noqa: F401
 
 
-class Error(object):
+class Error:
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
 
 
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     1Password Connect
 
@@ -11,10 +9,9 @@
 
 
 import pprint
-import re  # noqa: F401
 
 
-class Field(object):
+class Field:
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
 
@@ -172,7 +169,7 @@ def purpose(self, purpose):
         allowed_values = ["", "USERNAME", "PASSWORD", "NOTES"]  # noqa: E501
         if purpose not in allowed_values:  # noqa: E501
             raise ValueError(
-                "Invalid value for `purpose` ({0}), must be one of {1}"  # noqa: E501
+                "Invalid value for `purpose` ({}), must be one of {}"  # noqa: E501
                 .format(purpose, allowed_values)
             )
 
 
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     1Password Connect
 
@@ -11,10 +9,9 @@
 
 
 import pprint
-import re  # noqa: F401
 
 
-class FieldSection(object):
+class FieldSection:
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
 
 
@@ -1,8 +1,7 @@
 import pprint
-import re  # noqa: F401
 
 
-class File(object):
+class File:
     openapi_types = {
         'id': 'str',
         'name': 'str',
 
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     1Password Connect
 
@@ -11,15 +9,10 @@
 """
 
 
-try:
-    from inspect import getfullargspec
-except ImportError:
-    from inspect import getargspec as getfullargspec
+from inspect import getfullargspec
 import pprint
-import re  # noqa: F401
-import six
 
-class GeneratorRecipe(object):
+class GeneratorRecipe:
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
 
@@ -103,7 +96,7 @@ def character_sets(self, character_sets):
         allowed_values = ["LETTERS", "DIGITS", "SYMBOLS"]  # noqa: E501
         if (not set(character_sets).issubset(set(allowed_values))):  # noqa: E501
             raise ValueError(
-                "Invalid values for `character_sets` [{0}], must be a subset of [{1}]"  # noqa: E501
+                "Invalid values for `character_sets` [{}], must be a subset of [{}]"  # noqa: E501
                 .format(", ".join(map(str, set(character_sets) - set(allowed_values))),  # noqa: E501
                         ", ".join(map(str, allowed_values)))
             )
@@ -124,7 +117,7 @@ def convert(x):
             else:
                 return x
 
-        for attr, _ in six.iteritems(self.openapi_types):
+        for attr in self.openapi_types:
             value = getattr(self, attr)
             attr = self.attribute_map.get(attr, attr) if serialize else attr
             if isinstance(value, list):
 
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
     1Password Connect
 
@@ -11,10 +9,9 @@
 
 
 import pprint
-import re  # noqa: F401
 
 
-class Item(object):
+class Item:
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech