diff --git a/lib/cdist/__init__.py b/lib/cdist/__init__.py
index a3dc01cc..abdadf62 100644
--- a/lib/cdist/__init__.py
+++ b/lib/cdist/__init__.py
@@ -19,7 +19,7 @@
 #
 #
 
-BANNER = """ 
+BANNER = """
              ..          .       .x+=:.        s
            dF           @88>    z`    ^%      :8
           '88bu.        %8P        .   <k    .88
diff --git a/lib/cdist/config_install.py b/lib/cdist/config_install.py
index fa5cf2b0..2d921aaf 100644
--- a/lib/cdist/config_install.py
+++ b/lib/cdist/config_install.py
@@ -34,7 +34,7 @@ from cdist import core
 class ConfigInstall(object):
     """Cdist main class to hold arbitrary data"""
 
-    def __init__(self, context): 
+    def __init__(self, context):
 
         self.context = context
         self.log = logging.getLogger(self.context.target_host)
@@ -70,7 +70,7 @@ class ConfigInstall(object):
         start_time = time.time()
         self.deploy_to()
         self.cleanup()
-        self.log.info("Finished run in %s seconds", 
+        self.log.info("Finished run in %s seconds",
             time.time() - start_time)
 
     def stage_prepare(self):
@@ -135,7 +135,7 @@ class ConfigInstall(object):
             cdist_object.ran = True
 
         cdist_type = cdist_object.type
-            
+
         for requirement in cdist_object.requirements:
             self.log.debug("Object %s requires %s", cdist_object, requirement)
             # FIXME: requirement is a string, need to create object here
diff --git a/lib/cdist/context.py b/lib/cdist/context.py
index cf314409..77a6028f 100644
--- a/lib/cdist/context.py
+++ b/lib/cdist/context.py
@@ -74,7 +74,7 @@ class Context(object):
         self.remote_base_path = os.environ.get('__cdist_remote_out_dir', "/var/lib/cdist")
         self.remote_exec = os.environ.get('__remote_exec', "ssh -o User=root -q")
         self.remote_copy = os.environ.get('__remote_copy', "scp -o User=root -q")
-        self.remote = remote.Remote(self.target_host, self.remote_base_path, 
+        self.remote = remote.Remote(self.target_host, self.remote_base_path,
             self.remote_exec, self.remote_copy)
 
     def cleanup(self):
diff --git a/lib/cdist/core/manifest.py b/lib/cdist/core/manifest.py
index 50964fdc..52f310fb 100644
--- a/lib/cdist/core/manifest.py
+++ b/lib/cdist/core/manifest.py
@@ -65,7 +65,7 @@ class Manifest(object):
     def __init__(self, target_host, local):
         self.target_host = target_host
         self.local = local
-        
+
         self.log = logging.getLogger(self.target_host)
 
         self.env = {
diff --git a/lib/cdist/core/object.py b/lib/cdist/core/object.py
index eeb5799b..c5509aa8 100644
--- a/lib/cdist/core/object.py
+++ b/lib/cdist/core/object.py
@@ -46,7 +46,7 @@ class Object(object):
     """Represents a cdist object.
 
     All interaction with objects in cdist should be done through this class.
-    Directly accessing an object through the file system from python code is 
+    Directly accessing an object through the file system from python code is
     a bug.
 
     """
diff --git a/lib/cdist/core/type.py b/lib/cdist/core/type.py
index 02648b76..e9cb375a 100644
--- a/lib/cdist/core/type.py
+++ b/lib/cdist/core/type.py
@@ -38,7 +38,7 @@ class Type(object):
     """Represents a cdist type.
 
     All interaction with types in cdist should be done through this class.
-    Directly accessing an type through the file system from python code is 
+    Directly accessing an type through the file system from python code is
     a bug.
 
     """
diff --git a/lib/cdist/emulator.py b/lib/cdist/emulator.py
index b5682342..3f802dab 100644
--- a/lib/cdist/emulator.py
+++ b/lib/cdist/emulator.py
@@ -44,7 +44,7 @@ class Emulator(object):
         self.object_source  = os.environ['__cdist_manifest']
         self.target_host    = os.environ['__target_host']
         self.type_base_path = os.environ['__cdist_type_base_path']
-        
+
         self.object_base_path = os.path.join(self.global_path, "object")
 
         self.type_name      = os.path.basename(argv[0])
@@ -132,7 +132,7 @@ class Emulator(object):
         for key,value in vars(self.args).items():
             if value is not None:
                 self.parameters[key] = value
-        
+
         if self.cdist_object.exists:
             if self.cdist_object.parameters != self.parameters:
                 raise cdist.Error("Object %s already exists with conflicting parameters:\n%s: %s\n%s: %s"
diff --git a/lib/cdist/exec/local.py b/lib/cdist/exec/local.py
index 264279a2..41094faa 100644
--- a/lib/cdist/exec/local.py
+++ b/lib/cdist/exec/local.py
@@ -71,7 +71,7 @@ class Local(object):
         self.object_path = os.path.join(self.out_path, "object")
 
         self.log = logging.getLogger(self.target_host)
-    
+
     def create_directories(self):
         self.mkdir(self.out_path)
         self.mkdir(self.global_explorer_out_path)
@@ -116,7 +116,7 @@ class Local(object):
         self.log.debug("Local run script: %s", command)
         if env:
             self.log.debug("Local run script env: %s", env)
-        
+
         try:
             if return_output:
                 return subprocess.check_output(command, env=env).decode()
diff --git a/lib/cdist/exec/remote.py b/lib/cdist/exec/remote.py
index 943b8992..2847d89c 100644
--- a/lib/cdist/exec/remote.py
+++ b/lib/cdist/exec/remote.py
@@ -69,7 +69,7 @@ class Remote(object):
         self.global_explorer_path = os.path.join(self.conf_path, "explorer")
 
         self.log = logging.getLogger(self.target_host)
-    
+
     def create_directories(self):
         self.rmdir(self.base_path)
         self.mkdir(self.base_path)
@@ -110,7 +110,7 @@ class Remote(object):
 
         """
         assert isinstance(command, (list, tuple)), "list or tuple argument expected, got: %s" % command
-        
+
         # can't pass environment to remote side, so prepend command with
         # variable declarations
         if env:
@@ -151,7 +151,7 @@ class Remote(object):
         self.log.debug("Remote run script: %s", command)
         if env:
             self.log.debug("Remote run script env: %s", env)
-        
+
         try:
             if return_output:
                 return subprocess.check_output(command).decode()