diff --git a/DDDigi/src/DigiKernel.cpp b/DDDigi/src/DigiKernel.cpp
index 8af666e110595ade9bc9625921befa253cb2994e..566813ddcbf81223f4877dfb90faf543a3faeded 100644
--- a/DDDigi/src/DigiKernel.cpp
+++ b/DDDigi/src/DigiKernel.cpp
@@ -443,7 +443,7 @@ int DigiKernel::run()   {
     if ( 0 == internals->num_threads )  {
       internals->num_threads = ctrl_t::max_allowed_parallelism;
     }
-    info("+++ Number of TBB threads to:  %d",internals->num_threads);
+    info("+++ Number of TBB threads:     %d",internals->num_threads);
     info("+++ Number of parallel events: %d",internals->maxEventsParallel);
     internals->tbb_init = std::make_unique<ctrl_t>(ctrl_t::max_allowed_parallelism,internals->num_threads+1);
     if ( internals->maxEventsParallel >= 0 )   {
diff --git a/examples/DDDigi/scripts/DigiTest.py b/examples/DDDigi/scripts/DigiTest.py
index 6798d8464c5c6963ca34ade4be061fa97b667fa8..9a4205836401c9e5fcb831794660b380f945a32d 100644
--- a/examples/DDDigi/scripts/DigiTest.py
+++ b/examples/DDDigi/scripts/DigiTest.py
@@ -137,7 +137,7 @@ def test_setup_1(digi, print_level=WARNING, parallel=True):
   # ========================================================================================================
   digi.info('Created SIGNAL input')
   input = digi.input_action('DigiParallelActionSequence/READER')
-  input.adopt_action('DigiDDG4ROOT/SignalReader', 
+  input.adopt_action('DigiDDG4ROOT/SignalReader',
                      mask=0xCBAA,
                      input=[digi.next_input()],
                      OutputLevel=print_level, keep_raw=False)
diff --git a/examples/DDDigi/scripts/TestProperties.py b/examples/DDDigi/scripts/TestProperties.py
index c07b7a5fd1a9ef31f9ddf720682b9ff991059f99..a4db1357e4673683e50ab35cb7cda14beb8959fc 100644
--- a/examples/DDDigi/scripts/TestProperties.py
+++ b/examples/DDDigi/scripts/TestProperties.py
@@ -25,7 +25,7 @@ def run():
   histo = digi.create_action('DigiDepositEnergyMonitor/TestHisto')
   histo.histo1D_deposits = ("Energy", u"Some main deposit Title", 101, -0.5, 100.5)
   num_tests = num_tests + 1
-  histo.histo1D_delta    = ("Delta", u"Some delta Title", 50, -5, 5)
+  histo.histo1D_delta = ("Delta", u"Some delta Title", 50, -5, 5)
   num_tests = num_tests + 1
   histo.printProperties()
   info('property: histo1D_deposits =       %s [%s]' %
diff --git a/examples/DDG4/scripts/TestUserCommands.py b/examples/DDG4/scripts/TestUserCommands.py
index 2b25c533100de5c7e5fdad075f38c5b84da5b935..ed4074c8734a7f5cc32ca0d9a83c43580cbe489f 100644
--- a/examples/DDG4/scripts/TestUserCommands.py
+++ b/examples/DDG4/scripts/TestUserCommands.py
@@ -41,8 +41,9 @@ def run():
     sys.exit(0)
 
   kernel = DDG4.Kernel()
-  kernel.loadGeometry(str("file:" + os.environ['DD4hepExamplesINSTALL'] +
-                          "/examples/ClientTests/compact/BoxTrafos.xml"))
+  kernel.loadGeometry(str("file:"
+                          + os.environ['DD4hepExamplesINSTALL']
+                          + "/examples/ClientTests/compact/BoxTrafos.xml"))
   geant4 = DDG4.Geant4(kernel)
   # Configure UI
   if args.macro:
@@ -52,33 +53,28 @@ def run():
 
   ui.HaveUI = False
 
-  ui.ConfigureCommands = [
-    '/ddg4/Print/param configure-command-1',
-    '/ddg4/Print/print_param',
-    '/ddg4/Print/param configure-command-2',
-    '/ddg4/Print/print_param']
-  ui.InitializeCommands = [
-    '/ddg4/Print/param initialize-command-1',
-    '/ddg4/Print/print_param',
-    '/ddg4/Print/param initialize-command-2',
-    '/ddg4/Print/print_param']
-  ui.PreRunCommands = [
-    '/ddg4/Print/param pre-run-command-1',
-    '/ddg4/Print/print_param',
-    '/ddg4/Print/param pre-run-command-2',
-    '/ddg4/Print/print_param']
-  ui.TerminateCommands = [
-    '/ddg4/Print/param terminate-command-1',
-    '/ddg4/Print/print_param',
-    '/ddg4/Print/param terminate-command-2',
-    '/ddg4/Print/print_param',
-    '/ddg4/UI/terminate']
+  ui.ConfigureCommands = ['/ddg4/Print/param configure-command-1',
+                          '/ddg4/Print/print_param',
+                          '/ddg4/Print/param configure-command-2',
+                          '/ddg4/Print/print_param']
+  ui.InitializeCommands = ['/ddg4/Print/param initialize-command-1',
+                           '/ddg4/Print/print_param',
+                           '/ddg4/Print/param initialize-command-2',
+                           '/ddg4/Print/print_param']
+  ui.PreRunCommands = ['/ddg4/Print/param pre-run-command-1',
+                       '/ddg4/Print/print_param',
+                       '/ddg4/Print/param pre-run-command-2',
+                       '/ddg4/Print/print_param']
+  ui.TerminateCommands = ['/ddg4/Print/param terminate-command-1',
+                          '/ddg4/Print/print_param',
+                          '/ddg4/Print/param terminate-command-2',
+                          '/ddg4/Print/print_param',
+                          '/ddg4/UI/terminate']
   # Post-run commands are only executed in interactive mode!
-  ui.PostRunCommands = [
-    '/ddg4/Print/param post-run-command-1',
-    '/ddg4/Print/print_param',
-    '/ddg4/Print/param post-run-command-2',
-    '/ddg4/Print/print_param']
+  ui.PostRunCommands = ['/ddg4/Print/param post-run-command-1',
+                        '/ddg4/Print/print_param',
+                        '/ddg4/Print/param post-run-command-2',
+                        '/ddg4/Print/print_param']
 
   prt = DDG4.Action(kernel, 'TestPrintAction/Print')
   prt.enableUI()