diff --git a/.flake8 b/.flake8
index 0a8cb0cf..7e4b2a42 100644
--- a/.flake8
+++ b/.flake8
@@ -1,19 +1,23 @@
 [flake8]
 select = I,C,F
-exclude = .git,
-          __pycache__,
-          tests,
-          docs,
-          ./koji-*
-filename = *.py
-           ./cli/koji
-           ./builder/kojid
-           ./builder/mergerepos
-           ./hub/rpmdiff
-           ./util/kojira
-           ./util/koji-gc
-           ./util/koji-shadow
-           ./util/koji-sweep-db
-           ./vm/kojivmd
+exclude =
+    .git,
+    __pycache__,
+    tests,
+    docs,
+    ./koji-*/*
+
+filename =
+    *.py,
+    ./cli/koji,
+    ./builder/kojid,
+    ./builder/mergerepos,
+    ./hub/rpmdiff,
+    ./util/kojira,
+    ./util/koji-gc,
+    ./util/koji-shadow,
+    ./util/koji-sweep-db,
+    ./vm/kojivmd
+
 application_import_names = koji,koji_cli,kojihub,kojiweb,__main__
 import_order_style = pep8
diff --git a/util/koji-gc b/util/koji-gc
index a94d02fe..9d75b4c9 100755
--- a/util/koji-gc
+++ b/util/koji-gc
@@ -7,8 +7,9 @@
 #       Mike McLean <mikem@redhat.com>
 
 from __future__ import absolute_import
-import fcntl
+
 import datetime
+import fcntl
 import fnmatch
 import optparse
 import os