diff --git a/hub/kojihub.py b/hub/kojihub.py
index 8b3488ed..5e3c84f2 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -23,9 +23,9 @@
 #       Cristian Balint <cbalint@redhat.com>
 
 from __future__ import absolute_import
+
 import base64
 import calendar
-import koji.rpmdiff
 import datetime
 import errno
 import fcntl
@@ -43,18 +43,12 @@ import tarfile
 import tempfile
 import time
 import traceback
-import six.moves.xmlrpc_client
 import zipfile
-try:
-    # py 3.6+
-    import secrets
-except ImportError:
-    import random
-    secrets = None
 
 import rpm
 import six
-
+import six.moves.xmlrpc_client
+from six.moves import range
 from six.moves.urllib.parse import parse_qs
 
 import koji
@@ -62,18 +56,20 @@ import koji.auth
 import koji.db
 import koji.plugin
 import koji.policy
-import koji.xmlrpcplus
+import koji.rpmdiff
 import koji.tasks
+import koji.xmlrpcplus
 from koji.context import context
-from koji.util import base64encode
-from koji.util import decode_bytes
-from koji.util import dslice
-from koji.util import joinpath
-from koji.util import move_and_symlink
-from koji.util import multi_fnmatch
-from koji.util import safer_move
-from koji.util import to_list
-from six.moves import range
+from koji.util import (base64encode, decode_bytes, dslice, joinpath,
+                       move_and_symlink, multi_fnmatch, safer_move, to_list)
+
+try:
+    # py 3.6+
+    import secrets
+except ImportError:
+    import random
+    secrets = None
+
 
 logger = logging.getLogger('koji.hub')
 
diff --git a/hub/kojixmlrpc.py b/hub/kojixmlrpc.py
index d59b9c94..621284f1 100644
--- a/hub/kojixmlrpc.py
+++ b/hub/kojixmlrpc.py
@@ -18,18 +18,21 @@
 # Authors:
 #       Mike McLean <mikem@redhat.com>
 
-from __future__ import absolute_import
-from __future__ import division
+from __future__ import absolute_import, division
+
 import datetime
 import inspect
 import logging
 import os
-import sys
-import time
-import threading
-import traceback
 import pprint
 import resource
+import sys
+import threading
+import time
+import traceback
+
+import six
+from six.moves import range
 
 import koji
 import koji.auth
@@ -37,11 +40,9 @@ import koji.db
 import koji.plugin
 import koji.policy
 import koji.util
-# import xmlrpclib functions from koji to use tweaked Marshaller
-from koji.xmlrpcplus import getparser, dumps, Fault, ExtendedMarshaller
 from koji.context import context
-from six.moves import range
-import six
+# import xmlrpclib functions from koji to use tweaked Marshaller
+from koji.xmlrpcplus import ExtendedMarshaller, Fault, dumps, getparser
 
 
 class Marshaller(ExtendedMarshaller):