diff --git a/pantalaimon/client.py b/pantalaimon/client.py
index 63f3173..3bfc0ca 100644
--- a/pantalaimon/client.py
+++ b/pantalaimon/client.py
@@ -24,9 +24,9 @@ from jsonschema import Draft4Validator, FormatChecker, validators
 from nio import (AsyncClient, ClientConfig, EncryptionError, KeysQueryResponse,
                  KeyVerificationEvent, KeyVerificationKey, KeyVerificationMac,
                  KeyVerificationStart, LocalProtocolError, MegolmEvent,
-                 RoomEncryptedEvent, SyncResponse,
-                 RoomContextError, RoomMessageText, RoomMessageMedia,
-                 RoomEncryptedMedia, RoomTopicEvent, RoomNameEvent)
+                 RoomContextError, RoomEncryptedEvent, RoomEncryptedMedia,
+                 RoomMessageMedia, RoomMessageText, RoomNameEvent,
+                 RoomTopicEvent, SyncResponse)
 from nio.crypto import Sas
 from nio.store import SqliteStore
 
@@ -98,6 +98,7 @@ def validate_json(instance, schema):
 class UnknownRoomError(Exception):
     pass
 
+
 class InvalidOrderByError(Exception):
     pass
 
diff --git a/pantalaimon/daemon.py b/pantalaimon/daemon.py
index d28e893..fcd4678 100755
--- a/pantalaimon/daemon.py
+++ b/pantalaimon/daemon.py
@@ -28,7 +28,7 @@ from multidict import CIMultiDict
 from nio import (Api, EncryptionError, LoginResponse, OlmTrustError,
                  SendRetryError)
 
-from pantalaimon.client import PanClient, UnknownRoomError, InvalidOrderByError
+from pantalaimon.client import InvalidOrderByError, PanClient, UnknownRoomError
 from pantalaimon.log import logger
 from pantalaimon.store import ClientInfo, PanStore
 from pantalaimon.thread_messages import (AcceptSasMessage, CancelSasMessage,
diff --git a/pantalaimon/index.py b/pantalaimon/index.py
index 5d62191..75937d8 100644
--- a/pantalaimon/index.py
+++ b/pantalaimon/index.py
@@ -15,8 +15,8 @@
 import datetime
 
 import tantivy
-from nio import (RoomMessageText, RoomNameEvent, RoomTopicEvent,
-                 RoomMessageMedia, RoomEncryptedMedia)
+from nio import (RoomEncryptedMedia, RoomMessageMedia, RoomMessageText,
+                 RoomNameEvent, RoomTopicEvent)
 
 
 def sanitize_room_id(room_id):