diff --git a/src/otf_api/api.py b/src/otf_api/api.py
index 705d507..60f3999 100644
--- a/src/otf_api/api.py
+++ b/src/otf_api/api.py
@@ -62,7 +62,7 @@ def __init__(
 
         if user:
             self.user = user
-        elif username and password or (access_token and id_token):
+        elif (username and password) or (access_token and id_token):
             self.user = OtfUser(
                 username=username,
                 password=password,
diff --git a/src/otf_api/models/__init__.py b/src/otf_api/models/__init__.py
index de04968..280f816 100644
--- a/src/otf_api/models/__init__.py
+++ b/src/otf_api/models/__init__.py
@@ -40,8 +40,8 @@
     "MemberDetail",
     "MemberMembership",
     "MemberPurchaseList",
-    "OtfClassList",
     "OtfClass",
+    "OtfClassList",
     "OutOfStudioWorkoutHistoryList",
     "Pagination",
     "PerformanceSummaryDetail",