diff --git a/libp2p/kad_dht/common.py b/libp2p/kad_dht/common.py
index 8b82ea97..d7fb6c76 100644
--- a/libp2p/kad_dht/common.py
+++ b/libp2p/kad_dht/common.py
@@ -1,3 +1,7 @@
+"""
+Common Objects for Kademlia DHT implementation.
+"""
+
 from libp2p.custom_types import (
     TProtocol,
 )
diff --git a/libp2p/kad_dht/kad_dht.py b/libp2p/kad_dht/kad_dht.py
index f82c0063..b47d59e7 100644
--- a/libp2p/kad_dht/kad_dht.py
+++ b/libp2p/kad_dht/kad_dht.py
@@ -31,6 +31,11 @@ from libp2p.tools.async_service import (
     Service,
 )
 
+from .common import (
+    ALPHA,
+    PROTOCOL_ID,
+    QUERY_TIMEOUT,
+)
 from .pb.kademlia_pb2 import (
     Message,
 )
@@ -46,11 +51,6 @@ from .routing_table import (
 from .value_store import (
     ValueStore,
 )
-from .common import (
-    PROTOCOL_ID,
-    ALPHA,
-    QUERY_TIMEOUT
-)
 
 logger = logging.getLogger("kademlia-example.kad_dht")
 # logger = logging.getLogger("libp2p.kademlia")
diff --git a/libp2p/kad_dht/peer_routing.py b/libp2p/kad_dht/peer_routing.py
index fa938707..8e40ccf5 100644
--- a/libp2p/kad_dht/peer_routing.py
+++ b/libp2p/kad_dht/peer_routing.py
@@ -22,17 +22,16 @@ from libp2p.peer.peerinfo import (
     PeerInfo,
 )
 
-
+from .common import (
+    ALPHA,
+    PROTOCOL_ID,
+)
 from .pb.kademlia_pb2 import (
     Message,
 )
 from .routing_table import (
     RoutingTable,
 )
-from .common import (
-    PROTOCOL_ID,
-    ALPHA
-)
 from .utils import (
     sort_peer_ids_by_distance,
 )
diff --git a/libp2p/kad_dht/provider_store.py b/libp2p/kad_dht/provider_store.py
index 4938be2e..5c34f0c7 100644
--- a/libp2p/kad_dht/provider_store.py
+++ b/libp2p/kad_dht/provider_store.py
@@ -29,16 +29,15 @@ from libp2p.peer.peerinfo import (
     PeerInfo,
 )
 
+from .common import (
+    ALPHA,
+    PROTOCOL_ID,
+    QUERY_TIMEOUT,
+)
 from .pb.kademlia_pb2 import (
     Message,
 )
 
-from .common import (
-    PROTOCOL_ID,
-    ALPHA,
-    QUERY_TIMEOUT
-)
-
 # logger = logging.getLogger("libp2p.kademlia.provider_store")
 logger = logging.getLogger("kademlia-example.provider_store")
 
diff --git a/libp2p/kad_dht/routing_table.py b/libp2p/kad_dht/routing_table.py
index 4377c591..af4c7439 100644
--- a/libp2p/kad_dht/routing_table.py
+++ b/libp2p/kad_dht/routing_table.py
@@ -2,21 +2,16 @@
 Kademlia DHT routing table implementation.
 """
 
-from collections import (
-    OrderedDict,
-)
+from collections import OrderedDict
 import logging
 import time
 
 import trio
 
-from libp2p.abc import (
-    IHost,
+from libp2p.abc import IHost
+from libp2p.kad_dht.utils import (
+    xor_distance,
 )
-from libp2p.custom_types import (
-    TProtocol,
-)
-from libp2p.kad_dht.utils import xor_distance
 from libp2p.peer.id import (
     ID,
 )
@@ -24,9 +19,10 @@ from libp2p.peer.peerinfo import (
     PeerInfo,
 )
 
-from .pb.kademlia_pb2 import (
-    Message,
+from .common import (
+    PROTOCOL_ID,
 )
+from .pb.kademlia_pb2 import Message
 
 # logger = logging.getLogger("libp2p.kademlia.routing_table")
 logger = logging.getLogger("kademlia-example.routing_table")
@@ -243,7 +239,7 @@ class KBucket:
             raise ValueError(f"Peer {peer_id} not in bucket")
 
         # Default protocol ID for Kademlia DHT
-        protocol_id = TProtocol("/ipfs/kad/1.0.0")
+        protocol_id = PROTOCOL_ID
 
         try:
             # Open a stream to the peer with the DHT protocol
diff --git a/libp2p/kad_dht/value_store.py b/libp2p/kad_dht/value_store.py
index 488735e6..b79425fd 100644
--- a/libp2p/kad_dht/value_store.py
+++ b/libp2p/kad_dht/value_store.py
@@ -19,15 +19,14 @@ from libp2p.peer.id import (
     ID,
 )
 
+from .common import (
+    DEFAULT_TTL,
+    PROTOCOL_ID,
+)
 from .pb.kademlia_pb2 import (
     Message,
 )
 
-from .common import (
-    PROTOCOL_ID,
-    DEFAULT_TTL
-)
-
 # logger = logging.getLogger("libp2p.kademlia.value_store")
 logger = logging.getLogger("kademlia-example.value_store")