diff --git a/trezor_agent/__main__.py b/trezor_agent/__main__.py
index bf34e7a..d2817a9 100644
--- a/trezor_agent/__main__.py
+++ b/trezor_agent/__main__.py
@@ -1,14 +1,12 @@
-import os
-import re
-import sys
 import argparse
-import subprocess
 import functools
 import logging
+import os
+import re
+import subprocess
+import sys
 
-from . import trezor
-from . import server
-from . import formats
+from . import formats, server, trezor
 
 log = logging.getLogger(__name__)
 
diff --git a/trezor_agent/formats.py b/trezor_agent/formats.py
index 80d04c5..2377680 100644
--- a/trezor_agent/formats.py
+++ b/trezor_agent/formats.py
@@ -1,7 +1,8 @@
-import io
-import hashlib
 import base64
+import hashlib
+import io
 import logging
+
 import ecdsa
 import ed25519
 
diff --git a/trezor_agent/protocol.py b/trezor_agent/protocol.py
index b666346..d13bb07 100644
--- a/trezor_agent/protocol.py
+++ b/trezor_agent/protocol.py
@@ -1,9 +1,8 @@
-import io
 import binascii
+import io
 import logging
 
-from . import util
-from . import formats
+from . import formats, util
 
 log = logging.getLogger(__name__)
 
diff --git a/trezor_agent/server.py b/trezor_agent/server.py
index ba0ce41..38835fe 100644
--- a/trezor_agent/server.py
+++ b/trezor_agent/server.py
@@ -1,14 +1,12 @@
-import socket
+import contextlib
+import logging
 import os
+import socket
 import subprocess
 import tempfile
-import contextlib
 import threading
-import logging
 
-from . import protocol
-from . import formats
-from . import util
+from . import formats, protocol, util
 
 log = logging.getLogger(__name__)
 
diff --git a/trezor_agent/tests/test_formats.py b/trezor_agent/tests/test_formats.py
index 754c262..ba28900 100644
--- a/trezor_agent/tests/test_formats.py
+++ b/trezor_agent/tests/test_formats.py
@@ -1,4 +1,5 @@
 import binascii
+
 import pytest
 
 from .. import formats
diff --git a/trezor_agent/tests/test_protocol.py b/trezor_agent/tests/test_protocol.py
index 9ff6bc9..201615d 100644
--- a/trezor_agent/tests/test_protocol.py
+++ b/trezor_agent/tests/test_protocol.py
@@ -1,7 +1,6 @@
 import pytest
 
-from .. import protocol
-from .. import formats
+from .. import formats, protocol
 
 # pylint: disable=line-too-long
 
diff --git a/trezor_agent/tests/test_server.py b/trezor_agent/tests/test_server.py
index 9b4a159..f8a22fd 100644
--- a/trezor_agent/tests/test_server.py
+++ b/trezor_agent/tests/test_server.py
@@ -1,14 +1,13 @@
-import tempfile
+import io
+import os
 import socket
+import tempfile
 import threading
-import os
-import io
-import pytest
+
 import mock
+import pytest
 
-from .. import server
-from .. import protocol
-from .. import util
+from .. import protocol, server, util
 
 
 def test_socket():
diff --git a/trezor_agent/tests/test_trezor.py b/trezor_agent/tests/test_trezor.py
index 540befb..909c460 100644
--- a/trezor_agent/tests/test_trezor.py
+++ b/trezor_agent/tests/test_trezor.py
@@ -1,11 +1,10 @@
 import io
+
 import mock
 import pytest
 
+from .. import formats, util
 from ..trezor import client
-from .. import formats
-from .. import util
-
 
 ADDR = [2147483661, 2810943954, 3938368396, 3454558782, 3848009040]
 CURVE = 'nist256p1'
diff --git a/trezor_agent/tests/test_utils.py b/trezor_agent/tests/test_utils.py
index 9d88eec..2c9e9bd 100644
--- a/trezor_agent/tests/test_utils.py
+++ b/trezor_agent/tests/test_utils.py
@@ -1,4 +1,5 @@
 import io
+
 import pytest
 
 from .. import util
diff --git a/trezor_agent/trezor/client.py b/trezor_agent/trezor/client.py
index d3991a6..033b984 100644
--- a/trezor_agent/trezor/client.py
+++ b/trezor_agent/trezor/client.py
@@ -1,12 +1,11 @@
+import binascii
 import io
+import logging
 import re
 import struct
-import binascii
-import logging
 
-from .. import util
-from .. import formats
 from . import _factory as TrezorFactory
+from .. import formats, util
 
 log = logging.getLogger(__name__)
 
diff --git a/trezor_agent/util.py b/trezor_agent/util.py
index eeac94f..b17675f 100644
--- a/trezor_agent/util.py
+++ b/trezor_agent/util.py
@@ -1,5 +1,5 @@
-import struct
 import io
+import struct
 
 
 def send(conn, data, fmt=None):