diff --git a/src/a2a_storage/__init__.py b/src/a2a_storage/__init__.py
index 2707019cb..aa7b1fafc 100644
--- a/src/a2a_storage/__init__.py
+++ b/src/a2a_storage/__init__.py
@@ -16,8 +16,8 @@
 
 __all__ = [
     "A2AContextStore",
+    "A2AStorageFactory",
     "InMemoryA2AContextStore",
-    "SQLiteA2AContextStore",
     "PostgresA2AContextStore",
-    "A2AStorageFactory",
+    "SQLiteA2AContextStore",
 ]
diff --git a/src/observability/__init__.py b/src/observability/__init__.py
index df8601281..4a4285e8a 100644
--- a/src/observability/__init__.py
+++ b/src/observability/__init__.py
@@ -11,4 +11,4 @@
 from observability.formats import InferenceEventData, build_inference_event
 from observability.splunk import send_splunk_event
 
-__all__ = ["send_splunk_event", "InferenceEventData", "build_inference_event"]
+__all__ = ["InferenceEventData", "build_inference_event", "send_splunk_event"]
diff --git a/tests/e2e/utils/utils.py b/tests/e2e/utils/utils.py
index 6b73a0e1f..e42a0717b 100644
--- a/tests/e2e/utils/utils.py
+++ b/tests/e2e/utils/utils.py
@@ -268,7 +268,7 @@ def restart_container(container_name: str) -> None:
             check=True,
         )
     except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as e:
-        print(f"Failed to restart container {container_name}: {str(e.stderr)}")
+        print(f"Failed to restart container {container_name}: {e.stderr!s}")
         raise
 
     # Wait for container to be healthy
diff --git a/tests/unit/app/endpoints/test_streaming_query.py b/tests/unit/app/endpoints/test_streaming_query.py
index 8107a387c..cc3214169 100644
--- a/tests/unit/app/endpoints/test_streaming_query.py
+++ b/tests/unit/app/endpoints/test_streaming_query.py
@@ -2369,8 +2369,7 @@ def build_mcp_tool_call_side_effect(
             # Remove item from dict to simulate real behavior
             # arguments parameter is required by function signature but unused here
             _ = arguments
-            if output_index in mcp_call_items:
-                del mcp_call_items[output_index]
+            mcp_call_items.pop(output_index, None)
             return mock_tool_call
 
         mocker.patch(