diff --git a/bin/plug_ins/Stop/cp_stop_check b/bin/plug_ins/Stop/cp_stop_check
index 994e2d9..d9d181d 100755
--- a/bin/plug_ins/Stop/cp_stop_check
+++ b/bin/plug_ins/Stop/cp_stop_check
@@ -7,16 +7,14 @@
 import argparse
 import os
 import re
-import subprocess
-import sys
 
-from gen_arg import *
-from gen_call_robot import *
-from gen_cmd import *
-from gen_misc import *
-from gen_plug_in_utils import *
-from gen_print import *
-from gen_valid import *
+from gen_arg import *  # NOQA
+from gen_call_robot import *  # NOQA
+from gen_cmd import *  # NOQA
+from gen_misc import *  # NOQA
+from gen_plug_in_utils import *  # NOQA
+from gen_print import *  # NOQA
+from gen_valid import *  # NOQA
 
 # Set exit_on_error for gen_valid functions.
 set_exit_on_error(True)
@@ -272,8 +270,7 @@
         if hardware_error_found:
             print_timen(
                 "The caller wishes to stop test execution when the"
-                " Verify_hardware plug-in detects a"
-                + " hardware error."
+                " Verify_hardware plug-in detects a hardware error."
             )
             stop_check()
 
diff --git a/bin/print_ffdc_functions b/bin/print_ffdc_functions
index 632841c..b060e3e 100755
--- a/bin/print_ffdc_functions
+++ b/bin/print_ffdc_functions
@@ -27,8 +27,7 @@
         " functions.\n\nExample:"
     )
     + "\n\n\nDump Log:FFDC Generic Report:Get Request FFDC:SEL Log:BMC"
-    " Specific Files:Sys Inventory Files"
-    + ":Core Files:OS FFDC:Dump Files",
+    " Specific Files:Sys Inventory Files:Core Files:OS FFDC:Dump Files",
     formatter_class=argparse.RawDescriptionHelpFormatter,
     prefix_chars="-+",
 )
diff --git a/data/pel_variables.py b/data/pel_variables.py
index e5c3d6f..b883086 100644
--- a/data/pel_variables.py
+++ b/data/pel_variables.py
@@ -33,8 +33,7 @@
 )
 
 CMD_PROCEDURAL_SYMBOLIC_FRU_CALLOUT = (
-    ERROR_LOG_CREATE_BASE_CMD
-    + "org.open_power.Logging.Error.TestError1    "
+    ERROR_LOG_CREATE_BASE_CMD + "org.open_power.Logging.Error.TestError1    "
     " xyz.openbmc_project.Logging.Entry.Level.Error 0"
 )
 
@@ -50,8 +49,7 @@
 )
 
 CMD_UNRECOVERABLE_ERROR = (
-    ERROR_LOG_CREATE_BASE_CMD
-    + "org.open_power.Logging.Error.TestError1    "
+    ERROR_LOG_CREATE_BASE_CMD + "org.open_power.Logging.Error.TestError1    "
     " xyz.openbmc_project.Logging.Entry.Level.Error 0"
 )
 
@@ -62,15 +60,13 @@
 )
 
 CMD_UNRECOVERABLE_HOST_ERROR = (
-    ERROR_LOG_CREATE_BASE_CMD
-    + "xyz.openbmc_project.Host.Error.Event    "
+    ERROR_LOG_CREATE_BASE_CMD + "xyz.openbmc_project.Host.Error.Event    "
     " xyz.openbmc_project.Logging.Entry.Level.Error 1 RAWPEL"
     " /tmp/FILE_NBMC_UNRECOVERABLE"
 )
 
 CMD_INFORMATIONAL_HOST_ERROR = (
-    ERROR_LOG_CREATE_BASE_CMD
-    + "xyz.openbmc_project.Host.Error.Event    "
+    ERROR_LOG_CREATE_BASE_CMD + "xyz.openbmc_project.Host.Error.Event    "
     " xyz.openbmc_project.Logging.Entry.Level.Error 1 RAWPEL"
     " /tmp/FILE_HOST_INFORMATIONAL"
 )
diff --git a/ffdc/ffdc_collector.py b/ffdc/ffdc_collector.py
index 875ec81..7ef197d 100644
--- a/ffdc/ffdc_collector.py
+++ b/ffdc/ffdc_collector.py
@@ -329,8 +329,7 @@
             )
             self.logger.error(
                 "\tERROR: Requested protocol %s is not in working protocol"
-                " list.\n"
-                % self.remote_protocol
+                " list.\n" % self.remote_protocol
             )
             sys.exit(-1)
         else:
diff --git a/lib/openbmc_ffdc.py b/lib/openbmc_ffdc.py
index b5efa7a..f3d43f9 100644
--- a/lib/openbmc_ffdc.py
+++ b/lib/openbmc_ffdc.py
@@ -74,8 +74,7 @@
         if not int(state[interface]) and state["uptime"] == "":
             gp.print_error(
                 "BMC is not communicating via ssh or Redfish.  Terminating"
-                " FFDC"
-                + " collection.\n"
+                " FFDC" + " collection.\n"
             )
             return ffdc_file_list
 
diff --git a/lib/pel_utils.py b/lib/pel_utils.py
index 53dd8d7..d15f289 100644
--- a/lib/pel_utils.py
+++ b/lib/pel_utils.py
@@ -184,8 +184,7 @@
         raise PeltoolException(
             "Exception occurred during PEL and Event log "
             "comparison for SRC or event ID and created "
-            "time : "
-            + str(exception)
+            "time : " + str(exception)
         ) from exception