diff --git a/fsl/scripts/atlasq.py b/fsl/scripts/atlasq.py
index 13aa820504d4a58dd73dccdda5e0bcaa2bb5d58e..e1aae0eccefbd6484758f7fa239e6fbf665f4b9b 100644
--- a/fsl/scripts/atlasq.py
+++ b/fsl/scripts/atlasq.py
@@ -737,15 +737,17 @@ def main(args=None):
 
     return 0
 
+
 def atlasquery_emulation(args=None):
-    """Entry point for ``atlasquery``. Runs as ``atlasq`` in ``ohi`` 
+    """Entry point for ``atlasquery``. Runs as ``atlasq`` in ``ohi``
     mode.
     """
-    
+
     if args is None:
-        args=sys.argv[1:]
-        
-    return main(['ohi']+args)
+        args = sys.argv[1:]
+
+    return main(['ohi'] + args)
+
 
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/setup.py b/setup.py
index 020890ba56c2caf065a5b002bf4781daf06315d5..228878ef4cdb47ddfd6791924fb0e6aaf56815fd 100644
--- a/setup.py
+++ b/setup.py
@@ -124,10 +124,10 @@ setup(
 
     entry_points={
         'console_scripts' : [
-            'immv   = fsl.scripts.immv:main',
-            'imcp   = fsl.scripts.imcp:main',
-            'imglob = fsl.scripts.imglob:main',
-            'atlasq  = fsl.scripts.atlasq:main',
+            'immv       = fsl.scripts.immv:main',
+            'imcp       = fsl.scripts.imcp:main',
+            'imglob     = fsl.scripts.imglob:main',
+            'atlasq     = fsl.scripts.atlasq:main',
             'atlasquery = fsl.scripts.atlasq:atlasquery_emulation',
         ]
     }