diff --git a/cdist/__init__.py b/cdist/__init__.py
index 370a1e04..e6fdfac6 100644
--- a/cdist/__init__.py
+++ b/cdist/__init__.py
@@ -97,7 +97,8 @@ class CdistEntityError(Error):
     def stderr(self):
         output = []
         for stderr_name, stderr_path in self.stderr_paths:
-            if os.path.exists(stderr_path) and os.path.getsize(stderr_path) > 0:
+            if (os.path.exists(stderr_path) and
+                    os.path.getsize(stderr_path) > 0):
                 label_begin = '---- BEGIN ' + stderr_name + ':stderr ----'
                 label_end = '---- END ' + stderr_name + ':stderr ----'
                 output.append('\n' + label_begin)
diff --git a/cdist/configuration.py b/cdist/configuration.py
index 5737105a..848956aa 100644
--- a/cdist/configuration.py
+++ b/cdist/configuration.py
@@ -278,7 +278,8 @@ class Configuration(metaclass=Singleton):
     _dist_config_file = os.path.join(
         os.path.abspath(os.path.join(os.path.dirname(cdist.__file__), "conf")),
         'cdist.cfg')
-    default_config_files = (_global_config_file, _dist_config_file, _local_config_file, )
+    default_config_files = (_global_config_file, _dist_config_file,
+                            _local_config_file, )
     ENV_VAR_CONFIG_FILE = 'CDIST_CONFIG_FILE'
 
     VERBOSITY_VALUES = _VERBOSITY_VALUES