diff --git a/bfxapi/rest/endpoints/rest_authenticated_endpoints.py b/bfxapi/rest/endpoints/rest_authenticated_endpoints.py
index 947032b..7b4e11e 100644
--- a/bfxapi/rest/endpoints/rest_authenticated_endpoints.py
+++ b/bfxapi/rest/endpoints/rest_authenticated_endpoints.py
@@ -1,4 +1,4 @@
-from typing import List, Union, Literal, Optional
+from typing import List, Tuple, Union, Literal, Optional
 from decimal import Decimal
 from datetime import datetime
 
diff --git a/bfxapi/rest/endpoints/rest_merchant_endpoints.py b/bfxapi/rest/endpoints/rest_merchant_endpoints.py
index 8290a2c..0c80110 100644
--- a/bfxapi/rest/endpoints/rest_merchant_endpoints.py
+++ b/bfxapi/rest/endpoints/rest_merchant_endpoints.py
@@ -1,4 +1,5 @@
-from typing import List, Union, Literal, Optional
+from typing import TypedDict, List, Union, Literal, Optional
+
 from decimal import Decimal
 
 from .. types import *
diff --git a/bfxapi/rest/types.py b/bfxapi/rest/types.py
index 12fdb29..e1c39af 100644
--- a/bfxapi/rest/types.py
+++ b/bfxapi/rest/types.py
@@ -1,4 +1,4 @@
-from typing import Type, Tuple, List, Dict, TypedDict, Union, Optional, Literal, Any
+from typing import List, Dict, Optional, Literal, Any
 
 from dataclasses import dataclass
 
diff --git a/bfxapi/utils/JSONEncoder.py b/bfxapi/utils/JSONEncoder.py
index 5124376..edaba00 100644
--- a/bfxapi/utils/JSONEncoder.py
+++ b/bfxapi/utils/JSONEncoder.py
@@ -2,8 +2,6 @@ import json
 from decimal import Decimal
 from datetime import datetime
 
-from types import SimpleNamespace
-
 from typing import Type, List, Dict, Union, Any
 
 JSON = Union[Dict[str, "JSON"], List["JSON"], bool, int, float, str, Type[None]]
diff --git a/bfxapi/websocket/client/bfx_websocket_inputs.py b/bfxapi/websocket/client/bfx_websocket_inputs.py
index 48e3137..141f817 100644
--- a/bfxapi/websocket/client/bfx_websocket_inputs.py
+++ b/bfxapi/websocket/client/bfx_websocket_inputs.py
@@ -2,8 +2,8 @@ from decimal import Decimal
 from datetime import datetime
 
 from typing import Union, Optional, List, Tuple
-from ..types import JSON
-from ..enums import OrderType, FundingOfferType
+from .. enums import OrderType, FundingOfferType
+from ... utils.JSONEncoder import JSON
 
 class BfxWebsocketInputs(object):
     def __init__(self, __handle_websocket_input):
diff --git a/bfxapi/websocket/enums.py b/bfxapi/websocket/enums.py
index 8f06f62..b9530db 100644
--- a/bfxapi/websocket/enums.py
+++ b/bfxapi/websocket/enums.py
@@ -1,4 +1,4 @@
-from ..enums import *
+from .. enums import *
 
 class Channels(str, Enum):
     TICKER = "ticker"
diff --git a/bfxapi/websocket/types.py b/bfxapi/websocket/types.py
index 0ffa870..063836a 100644
--- a/bfxapi/websocket/types.py
+++ b/bfxapi/websocket/types.py
@@ -1,10 +1,10 @@
-from typing import Type, Tuple, List, Dict, TypedDict, Union, Optional, Any
+from typing import Optional
 
 from dataclasses import dataclass
 
-from ..labeler import _Type
-from ..notification import Notification
-from ..utils.JSONEncoder import JSON
+from .. labeler import _Type
+from .. notification import Notification
+from .. utils.JSONEncoder import JSON
 
 #region Type hinting for Websocket Public Channels