diff --git a/sensor_calibration_manager/sensor_calibration_manager/calibrator_base.py b/sensor_calibration_manager/sensor_calibration_manager/calibrator_base.py
index 33917c81..5da46e89 100644
--- a/sensor_calibration_manager/sensor_calibration_manager/calibrator_base.py
+++ b/sensor_calibration_manager/sensor_calibration_manager/calibrator_base.py
@@ -124,9 +124,7 @@ def add_calibrator(self, service_name: str, expected_calibration_frames: List[Fr
         self.calibrators.append(calibration_wrapper)
 
     def on_service_status_changed(self):
-        self.services_available = all(
-            [calibrator.is_available() for calibrator in self.calibrators]
-        )
+        self.services_available = all(calibrator.is_available() for calibrator in self.calibrators)
         self.update_status()
 
     def on_calibration_result(self):
diff --git a/sensor_calibration_manager/sensor_calibration_manager/calibrators/rdv/mapping_based_lidar_lidar_calibrator.py b/sensor_calibration_manager/sensor_calibration_manager/calibrators/rdv/mapping_based_lidar_lidar_calibrator.py
index 90db2a7f..f0a276a1 100644
--- a/sensor_calibration_manager/sensor_calibration_manager/calibrators/rdv/mapping_based_lidar_lidar_calibrator.py
+++ b/sensor_calibration_manager/sensor_calibration_manager/calibrators/rdv/mapping_based_lidar_lidar_calibrator.py
@@ -82,9 +82,11 @@ def post_process(self, calibration_transforms: Dict[str, Dict[str, np.array]]):
 
         result = {
             self.sensor_kit_frame: {
-                calibration_base_lidar_frame: transform
-                for calibration_base_lidar_frame, transform in zip(
-                    self.calibration_base_lidar_frames, sensor_kit_to_calibration_lidar_transforms
+                dict(
+                    zip(
+                        self.calibration_base_lidar_frames,
+                        sensor_kit_to_calibration_lidar_transforms,
+                    )
                 )
             }
         }
diff --git a/sensor_calibration_manager/sensor_calibration_manager/calibrators/xx1/mapping_based_lidar_lidar_calibrator.py b/sensor_calibration_manager/sensor_calibration_manager/calibrators/xx1/mapping_based_lidar_lidar_calibrator.py
index c9486c8d..21c18a2c 100644
--- a/sensor_calibration_manager/sensor_calibration_manager/calibrators/xx1/mapping_based_lidar_lidar_calibrator.py
+++ b/sensor_calibration_manager/sensor_calibration_manager/calibrators/xx1/mapping_based_lidar_lidar_calibrator.py
@@ -78,9 +78,11 @@ def post_process(self, calibration_transforms: Dict[str, Dict[str, np.array]]):
 
         result = {
             self.sensor_kit_frame: {
-                calibration_base_lidar_frame: transform
-                for calibration_base_lidar_frame, transform in zip(
-                    self.calibration_base_lidar_frames, sensor_kit_to_calibration_lidar_transforms
+                dict(
+                    zip(
+                        self.calibration_base_lidar_frames,
+                        sensor_kit_to_calibration_lidar_transforms,
+                    )
                 )
             }
         }