diff --git a/scripts/pyflakes b/scripts/pyflakes
--- a/scripts/pyflakes
+++ b/scripts/pyflakes
@@ -5,9 +5,11 @@ Inspired by pyflakes/api.py and flake8/p
 """
 
 import sys
+
 import pyflakes.api
 import pyflakes.messages
 
+
 class Reporter:
 
     warned = False
diff --git a/scripts/whitespacecleanup.sh b/scripts/whitespacecleanup.sh
--- a/scripts/whitespacecleanup.sh
+++ b/scripts/whitespacecleanup.sh
@@ -18,6 +18,6 @@ hg mani | xargs chmod -x
 hg loc 'set:!binary()&grep("^#!")&!(**_tmpl.py)&!(**/template**)' | xargs chmod +x
 
 # isort is installed from dev_requirements.txt
-isort --line-width 160 --wrap-length 160 --lines-after-imports 2 `hg loc '*.py'`
+hg loc 'set:!binary()&grep("^#!.*python")' '*.py' | xargs isort --line-width 160 --wrap-length 160 --lines-after-imports 2
 
 hg diff