diff --git a/pysqa/__main__.py b/pysqa/__main__.py
index 4c6cd70a..46d86a4e 100644
--- a/pysqa/__main__.py
+++ b/pysqa/__main__.py
@@ -1,6 +1,6 @@
 import sys
-from pysqa.cmd import command_line
 
+from pysqa.cmd import command_line
 
 if __name__ == "__main__":
     command_line(sys.argv[1:])
diff --git a/pysqa/cmd.py b/pysqa/cmd.py
index 126f68dd..8c0bea30 100644
--- a/pysqa/cmd.py
+++ b/pysqa/cmd.py
@@ -1,7 +1,8 @@
-import sys
-import os
-import json
 import getopt
+import json
+import os
+import sys
+
 from pysqa.queueadapter import QueueAdapter
 from pysqa.utils.execute import execute_command
 
diff --git a/pysqa/ext/modular.py b/pysqa/ext/modular.py
index 95736624..6beec538 100644
--- a/pysqa/ext/modular.py
+++ b/pysqa/ext/modular.py
@@ -2,6 +2,7 @@
 # Copyright (c) Jan Janssen
 
 import pandas
+
 from pysqa.utils.basic import BasisQueueAdapter
 from pysqa.utils.execute import execute_command
 
diff --git a/pysqa/ext/remote.py b/pysqa/ext/remote.py
index 1a59c132..c1e8150d 100644
--- a/pysqa/ext/remote.py
+++ b/pysqa/ext/remote.py
@@ -3,10 +3,12 @@
 
 import json
 import os
+import warnings
+
 import pandas
 import paramiko
-import warnings
 from tqdm import tqdm
+
 from pysqa.utils.basic import BasisQueueAdapter
 from pysqa.utils.execute import execute_command
 
diff --git a/pysqa/queueadapter.py b/pysqa/queueadapter.py
index f06888a1..aca30f22 100644
--- a/pysqa/queueadapter.py
+++ b/pysqa/queueadapter.py
@@ -2,10 +2,11 @@
 # Copyright (c) Jan Janssen
 
 import os
+
+from pysqa.ext.modular import ModularQueueAdapter
 from pysqa.utils.basic import BasisQueueAdapter
 from pysqa.utils.config import read_config
 from pysqa.utils.execute import execute_command
-from pysqa.ext.modular import ModularQueueAdapter
 
 __author__ = "Jan Janssen"
 __copyright__ = "Copyright 2019, Jan Janssen"
diff --git a/pysqa/utils/basic.py b/pysqa/utils/basic.py
index 78c120d5..8d7bd0e7 100644
--- a/pysqa/utils/basic.py
+++ b/pysqa/utils/basic.py
@@ -3,12 +3,14 @@
 
 import getpass
 import importlib
-from jinja2 import Template
 import os
 import re
+
 import pandas
-from pysqa.utils.queues import Queues
+from jinja2 import Template
+
 from pysqa.utils.execute import execute_command
+from pysqa.utils.queues import Queues
 
 
 class BasisQueueAdapter(object):
diff --git a/pysqa/wrapper/flux.py b/pysqa/wrapper/flux.py
index bd8404e9..0f021694 100644
--- a/pysqa/wrapper/flux.py
+++ b/pysqa/wrapper/flux.py
@@ -1,6 +1,7 @@
 # coding: utf-8
-from flux.job import JobID
 import pandas
+from flux.job import JobID
+
 from pysqa.wrapper.generic import SchedulerCommands
 
 
diff --git a/pysqa/wrapper/gent.py b/pysqa/wrapper/gent.py
index 946eaa0c..fe5a643d 100644
--- a/pysqa/wrapper/gent.py
+++ b/pysqa/wrapper/gent.py
@@ -3,8 +3,8 @@
 # Distributed under the terms of "New BSD License", see the LICENSE file.
 
 import pandas
-from pysqa.wrapper.slurm import SlurmCommands
 
+from pysqa.wrapper.slurm import SlurmCommands
 
 __author__ = "Jan Janssen"
 __copyright__ = (
diff --git a/pysqa/wrapper/sge.py b/pysqa/wrapper/sge.py
index 105ed978..c5dbc66f 100644
--- a/pysqa/wrapper/sge.py
+++ b/pysqa/wrapper/sge.py
@@ -2,8 +2,9 @@
 # Copyright (c) Max-Planck-Institut für Eisenforschung GmbH - Computational Materials Design (CM) Department
 # Distributed under the terms of "New BSD License", see the LICENSE file.
 
-import pandas
 import defusedxml.ElementTree as ETree
+import pandas
+
 from pysqa.wrapper.generic import SchedulerCommands
 
 __author__ = "Jan Janssen"
diff --git a/pysqa/wrapper/slurm.py b/pysqa/wrapper/slurm.py
index 7bf45acc..6be70969 100644
--- a/pysqa/wrapper/slurm.py
+++ b/pysqa/wrapper/slurm.py
@@ -3,8 +3,8 @@
 # Distributed under the terms of "New BSD License", see the LICENSE file.
 
 import pandas
-from pysqa.wrapper.generic import SchedulerCommands
 
+from pysqa.wrapper.generic import SchedulerCommands
 
 __author__ = "Jan Janssen"
 __copyright__ = (
diff --git a/pysqa/wrapper/torque.py b/pysqa/wrapper/torque.py
index 6fa259d4..b1da1e96 100644
--- a/pysqa/wrapper/torque.py
+++ b/pysqa/wrapper/torque.py
@@ -3,7 +3,9 @@
 # Distributed under the terms of "New BSD License", see the LICENSE file.
 
 import re
+
 import pandas as pd
+
 from pysqa.wrapper.generic import SchedulerCommands
 
 __author__ = "Jan Janssen"