diff --git a/libp2p/network/connection/raw_connection_interface.py b/libp2p/network/connection/raw_connection_interface.py
index 088eaec1..1810f58f 100644
--- a/libp2p/network/connection/raw_connection_interface.py
+++ b/libp2p/network/connection/raw_connection_interface.py
@@ -1,5 +1,5 @@
-import asyncio
 from abc import ABC, abstractmethod
+import asyncio
 
 
 class IRawConnection(ABC):
diff --git a/libp2p/network/typing.py b/libp2p/network/typing.py
index 472510f2..713c1d8f 100644
--- a/libp2p/network/typing.py
+++ b/libp2p/network/typing.py
@@ -1,4 +1,5 @@
 from typing import Awaitable, Callable
+
 from libp2p.stream_muxer.abc import IMuxedStream
 
 GenericProtocolHandlerFn = Callable[[IMuxedStream], Awaitable[None]]
diff --git a/libp2p/stream_muxer/abc.py b/libp2p/stream_muxer/abc.py
index 1e137eb9..05a4cfe8 100644
--- a/libp2p/stream_muxer/abc.py
+++ b/libp2p/stream_muxer/abc.py
@@ -1,11 +1,11 @@
 from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING
+
+from multiaddr import Multiaddr
 
 from libp2p.peer.id import ID
 from libp2p.security.secure_conn_interface import ISecureConn
 from libp2p.stream_muxer.mplex.constants import HeaderTags
-from multiaddr import Multiaddr
-
-from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     # Prevent GenericProtocolHandlerFn introducing circular dependencies
diff --git a/libp2p/stream_muxer/mplex/mplex.py b/libp2p/stream_muxer/mplex/mplex.py
index 54a9e89d..a6e5b486 100644
--- a/libp2p/stream_muxer/mplex/mplex.py
+++ b/libp2p/stream_muxer/mplex/mplex.py
@@ -1,16 +1,17 @@
 import asyncio
-from typing import Tuple, Dict
+from typing import Dict, Tuple
 
 from multiaddr import Multiaddr
-from libp2p.security.secure_conn_interface import ISecureConn
+
 from libp2p.network.connection.raw_connection_interface import IRawConnection
 from libp2p.network.typing import GenericProtocolHandlerFn
 from libp2p.peer.id import ID
+from libp2p.security.secure_conn_interface import ISecureConn
 from libp2p.stream_muxer.abc import IMuxedConn, IMuxedStream
 
 from .constants import HeaderTags
-from .utils import encode_uvarint, decode_uvarint_from_stream
 from .mplex_stream import MplexStream
+from .utils import decode_uvarint_from_stream, encode_uvarint
 
 
 class Mplex(IMuxedConn):
diff --git a/libp2p/stream_muxer/mplex/mplex_stream.py b/libp2p/stream_muxer/mplex/mplex_stream.py
index 05a87071..e4fb21d0 100644
--- a/libp2p/stream_muxer/mplex/mplex_stream.py
+++ b/libp2p/stream_muxer/mplex/mplex_stream.py
@@ -1,6 +1,6 @@
 import asyncio
-from libp2p.stream_muxer.abc import IMuxedStream, IMuxedConn
 
+from libp2p.stream_muxer.abc import IMuxedConn, IMuxedStream
 
 from .constants import HeaderTags
 
diff --git a/libp2p/stream_muxer/mplex/utils.py b/libp2p/stream_muxer/mplex/utils.py
index 52cf0ff2..35467493 100644
--- a/libp2p/stream_muxer/mplex/utils.py
+++ b/libp2p/stream_muxer/mplex/utils.py
@@ -1,6 +1,5 @@
 import asyncio
 import struct
-
 from typing import Tuple
 
 
diff --git a/libp2p/transport/listener_interface.py b/libp2p/transport/listener_interface.py
index 051d289b..fecc3b9e 100644
--- a/libp2p/transport/listener_interface.py
+++ b/libp2p/transport/listener_interface.py
@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
-
 from typing import List
+
 from multiaddr import Multiaddr
 
 
diff --git a/libp2p/transport/tcp/tcp.py b/libp2p/transport/tcp/tcp.py
index 2682c2b1..4a9217db 100644
--- a/libp2p/transport/tcp/tcp.py
+++ b/libp2p/transport/tcp/tcp.py
@@ -1,16 +1,15 @@
 import asyncio
+from socket import socket
+from typing import List
 
-from typing import List, Callable
 from multiaddr import Multiaddr
 
-from socket import socket
-
-from libp2p.peer.id import ID
-from libp2p.transport.typing import THandler
-from libp2p.network.connection.raw_connection_interface import IRawConnection
 from libp2p.network.connection.raw_connection import RawConnection
+from libp2p.network.connection.raw_connection_interface import IRawConnection
+from libp2p.peer.id import ID
 from libp2p.transport.listener_interface import IListener
 from libp2p.transport.transport_interface import ITransport
+from libp2p.transport.typing import THandler
 
 
 class TCPListener(IListener):
diff --git a/libp2p/transport/transport_interface.py b/libp2p/transport/transport_interface.py
index 38ea365f..2f5a1ac6 100644
--- a/libp2p/transport/transport_interface.py
+++ b/libp2p/transport/transport_interface.py
@@ -1,8 +1,10 @@
 from abc import ABC, abstractmethod
 
 from multiaddr import Multiaddr
-from libp2p.peer.id import ID
+
 from libp2p.network.connection.raw_connection_interface import IRawConnection
+from libp2p.peer.id import ID
+
 from .listener_interface import IListener
 from .typing import THandler
 
diff --git a/libp2p/transport/typing.py b/libp2p/transport/typing.py
index 0f5eabbd..147fe11d 100644
--- a/libp2p/transport/typing.py
+++ b/libp2p/transport/typing.py
@@ -1,5 +1,4 @@
 from asyncio import StreamReader, StreamWriter
-from typing import NewType, Callable
-
+from typing import Callable
 
 THandler = Callable[[StreamReader, StreamWriter], None]
diff --git a/libp2p/transport/upgrader.py b/libp2p/transport/upgrader.py
index 2d4dc63f..363247a1 100644
--- a/libp2p/transport/upgrader.py
+++ b/libp2p/transport/upgrader.py
@@ -1,15 +1,15 @@
 from typing import Dict, Sequence
 
-from libp2p.stream_muxer.mplex.mplex import Mplex
-from libp2p.security.security_multistream import SecurityMultistream, TProtocol
 from libp2p.network.connection.raw_connection_interface import IRawConnection
 from libp2p.network.typing import GenericProtocolHandlerFn
 from libp2p.peer.id import ID
 from libp2p.security.secure_conn_interface import ISecureConn
 from libp2p.security.secure_transport_interface import ISecureTransport
+from libp2p.security.security_multistream import SecurityMultistream, TProtocol
+from libp2p.stream_muxer.mplex.mplex import Mplex
 
-from .transport_interface import ITransport
 from .listener_interface import IListener
+from .transport_interface import ITransport
 
 
 class TransportUpgrader: