diff --git a/projects/etos_suite_runner/src/etos_suite_runner/__init__.py b/projects/etos_suite_runner/src/etos_suite_runner/__init__.py
index 75d468b..7355620 100644
--- a/projects/etos_suite_runner/src/etos_suite_runner/__init__.py
+++ b/projects/etos_suite_runner/src/etos_suite_runner/__init__.py
@@ -42,7 +42,7 @@
 LOGGER = logging.getLogger(__name__)
 
 # Setting OTEL_COLLECTOR_HOST will override the default OTEL collector endpoint.
-# This is needed when using the centralized cluster-level OTEL collector instead of sidecar collector.
+# This is needed when using the cluster-level OTEL collector instead of sidecar collector.
 if os.getenv("OTEL_COLLECTOR_HOST"):
     os.environ["OTEL_EXPORTER_OTLP_TRACES_ENDPOINT"] = os.getenv("OTEL_COLLECTOR_HOST")
     LOGGER.info("Using OTEL collector: %s", os.getenv("OTEL_COLLECTOR_HOST"))
diff --git a/projects/etos_suite_runner/src/etos_suite_runner/esr.py b/projects/etos_suite_runner/src/etos_suite_runner/esr.py
index 1e348d3..7bfe978 100644
--- a/projects/etos_suite_runner/src/etos_suite_runner/esr.py
+++ b/projects/etos_suite_runner/src/etos_suite_runner/esr.py
@@ -15,7 +15,6 @@
 # limitations under the License.
 # -*- coding: utf-8 -*-
 """ETOS suite runner module."""
-import json
 import logging
 import os
 import signal
diff --git a/projects/etos_suite_runner/src/etos_suite_runner/lib/suite.py b/projects/etos_suite_runner/src/etos_suite_runner/lib/suite.py
index 342ece9..daa2968 100644
--- a/projects/etos_suite_runner/src/etos_suite_runner/lib/suite.py
+++ b/projects/etos_suite_runner/src/etos_suite_runner/lib/suite.py
@@ -101,7 +101,8 @@ def start(self, identifier: str, otel_context: opentelemetry.context.context.Con
 
         :param identifier: An identifier for logs in this sub suite.
         """
-        # OpenTelemetry context needs to be retrieved here, since the subsuite is running in a separate process
+        # OpenTelemetry context needs to be retrieved here:
+        # the subsuite is running in a separate process
         span_name = "execute_testrunner"
         with self.otel_tracer.start_as_current_span(span_name, context=otel_context) as span:
             span.set_attribute("subsuite_id", identifier)
@@ -175,10 +176,10 @@ class TestSuite:  # pylint:disable=too-many-instance-attributes
     __activity_finished = None
 
     def __init__(self,
-                 etos: ETOS,
-                 params: ESRParameters,
-                 suite: dict,
-                 otel_context: opentelemetry.context.context.Context = None
+        etos: ETOS,
+        params: ESRParameters,
+        suite: dict,
+        otel_context: opentelemetry.context.context.Context = None
     ) -> None:
         """Initialize a TestSuite instance."""
         self.etos = etos
diff --git a/projects/etos_suite_runner/src/etos_suite_runner/otel_tracing.py b/projects/etos_suite_runner/src/etos_suite_runner/otel_tracing.py
index c42b3cf..c311340 100644
--- a/projects/etos_suite_runner/src/etos_suite_runner/otel_tracing.py
+++ b/projects/etos_suite_runner/src/etos_suite_runner/otel_tracing.py
@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # -*- coding: utf-8 -*-
+"""OpenTelemetry-related code."""
 import logging
 import os
 import opentelemetry