diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 1c5356e6014401ed449632607c5b01b1bd1baab9..5c1be18a8be9ca13dc35571647e23efdd8d5c90c 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -43,6 +43,7 @@ from ganeti import objects
 from ganeti import opcodes
 from ganeti import ssconf
 
+
 class LogicalUnit(object):
   """Logical Unit base class.
 
@@ -2739,6 +2740,7 @@ def _GenerateDRBD8Branch(cfg, primary, secondary, size, names, iv_name):
                           iv_name=iv_name)
   return drbd_dev
 
+
 def _GenerateDiskTemplate(cfg, template_name,
                           instance_name, primary_node,
                           secondary_nodes, disk_sz, swap_sz):
diff --git a/lib/mcpu.py b/lib/mcpu.py
index cd1a3a9d8b7f77c9d793271bb50105eb4d0fd997..c5bcc8d3b3b865efc54edc0a639c05d7e12e9689 100644
--- a/lib/mcpu.py
+++ b/lib/mcpu.py
@@ -38,6 +38,7 @@ from ganeti import config
 from ganeti import ssconf
 from ganeti import logger
 
+
 class Processor(object):
   """Object which runs OpCodes"""
   DISPATCH_TABLE = {
diff --git a/lib/objects.py b/lib/objects.py
index 6dd5141b217cd7c72699dfe8b500144461aca4f9..b782c26c79469ae98fe9990e12697f99fa85ce4b 100644
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -648,6 +648,7 @@ class OS(ConfigObject):
 
   __bool__ = __nonzero__
 
+
 class Node(TaggableObject):
   """Config object representing a node."""
   __slots__ = TaggableObject.__slots__ + [
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 87bcf057b20a7ec43687c8c13741f47d76c54801..93ea6ed11101fdf8d6b5b7e5a600b281c0399985 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -275,12 +275,14 @@ class OpDiagnoseOS(OpCode):
   OP_ID = "OP_OS_DIAGNOSE"
   __slots__ = []
 
+
 # Exports opcodes
 class OpQueryExports(OpCode):
   """Compute the list of exported images."""
   OP_ID = "OP_BACKUP_QUERY"
   __slots__ = ["nodes"]
 
+
 class OpExportInstance(OpCode):
   """Export an instance."""
   OP_ID = "OP_BACKUP_EXPORT"
diff --git a/lib/rpc.py b/lib/rpc.py
index 0e4b5dccc6e75c7578a80380152e39c749b9802e..51b1d2e3d302776a75f32c6c330096e574777463 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -38,6 +38,7 @@ from ganeti import constants
 from ganeti import objects
 from ganeti import ssconf
 
+
 class NodeController:
   """Node-handling class.
 
diff --git a/lib/utils.py b/lib/utils.py
index 6cbd268c7a24ced08efcd8f37a8cc6e0c0200355..3319e719c8d903931c4c8a2c81df21a5f37c098b 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -51,6 +51,7 @@ _re_shell_unquoted = re.compile('^[-.,=:/_+@A-Za-z0-9]+$')
 
 debug = False
 
+
 class RunResult(object):
   """Simple class for holding the result of running external programs.
 
diff --git a/scripts/gnt-backup b/scripts/gnt-backup
index dc456e142ea185bf9cc264b9fa626140ce8240ff..a05e1ff1a51ba26d7ca47b2fb3fbd3363b6acd89 100755
--- a/scripts/gnt-backup
+++ b/scripts/gnt-backup
@@ -27,6 +27,7 @@ from ganeti import cmdlib
 from ganeti import opcodes
 from ganeti import constants
 
+
 def PrintExportList(opts, args):
   """Prints a list of all the exported system images.
 
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index d5661d3028f88cf1f44017e55cc224ef50449ffb..7d3aa9418c79fb34b46d273fa87510dd206286bc 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -39,6 +39,7 @@ _SHUTDOWN_NODES_PRI = "nodes-pri"
 _SHUTDOWN_NODES_SEC = "nodes-sec"
 _SHUTDOWN_INSTANCES = "instances"
 
+
 def _ExpandMultiNames(mode, names):
   """Expand the given names using the passed mode.
 
@@ -382,6 +383,7 @@ def StartupInstance(opts, args):
     SubmitOpCode(op)
   return 0
 
+
 def RebootInstance(opts, args):
   """Reboot an instance
 
@@ -407,6 +409,7 @@ def RebootInstance(opts, args):
     SubmitOpCode(op)
   return 0
 
+
 def ShutdownInstance(opts, args):
   """Shutdown an instance.
 
diff --git a/tools/lvmstrap b/tools/lvmstrap
index 153de88e225704106e15beb367fa8d826ffc31f0..8fbe1fb4c6749006f45d0c2ca4758afb81a99f24 100755
--- a/tools/lvmstrap
+++ b/tools/lvmstrap
@@ -110,6 +110,7 @@ class ParameterError(Error):
   """
   pass
 
+
 def Usage():
   """Shows program usage information and exits the program."""