diff --git a/trezor_agent/__main__.py b/trezor_agent/__main__.py
index 93f7c39..82c7df7 100644
--- a/trezor_agent/__main__.py
+++ b/trezor_agent/__main__.py
@@ -4,7 +4,7 @@ import logging
 import os
 import sys
 
-from . import formats, protocol, server, client
+from . import client, formats, protocol, server
 
 log = logging.getLogger(__name__)
 
diff --git a/trezor_agent/client.py b/trezor_agent/client.py
index c271c20..249c066 100644
--- a/trezor_agent/client.py
+++ b/trezor_agent/client.py
@@ -4,8 +4,7 @@ import logging
 import re
 import struct
 
-from . import factory
-from . import formats, util
+from . import factory, formats, util
 
 log = logging.getLogger(__name__)
 
diff --git a/trezor_agent/tests/test_client.py b/trezor_agent/tests/test_client.py
index 3f04b32..d4b56fa 100644
--- a/trezor_agent/tests/test_client.py
+++ b/trezor_agent/tests/test_client.py
@@ -2,8 +2,7 @@ import io
 
 import mock
 
-from .. import formats, util
-from .. import client, factory
+from .. import client, factory, formats, util
 
 ADDR = [2147483661, 2810943954, 3938368396, 3454558782, 3848009040]
 CURVE = 'nist256p1'