diff --git a/datatypes/epc/domain/mapper.py b/datatypes/epc/domain/mapper.py
index ab1bb0aa..9af386da 100644
--- a/datatypes/epc/domain/mapper.py
+++ b/datatypes/epc/domain/mapper.py
@@ -62,7 +62,6 @@ from datatypes.epc.surveys.pashub_rdsap_site_notes import (
     ExtensionConstruction,
     ExtensionMeasurements,
     ExtensionRoofSpace,
-    FloorConstruction,
     FloorMeasurement,
     HeatingAndHotWater,
     PasHubRdSapSiteNotes,
@@ -265,7 +264,9 @@ class EpcPropertyDataMapper:
             photovoltaic_array=survey.renewables.photovoltaic_panel != "None",
             sap_ventilation=_map_elmhurst_ventilation(survey.ventilation),
             percent_draughtproofed=survey.draught_proofing_percent,
-            waste_water_heat_recovery="None" if not survey.renewables.wwhrs_present else "Present",
+            waste_water_heat_recovery=(
+                "None" if not survey.renewables.wwhrs_present else "Present"
+            ),
             any_unheated_rooms=survey.heated_habitable_rooms < survey.habitable_rooms,
         )
 
@@ -1649,7 +1650,11 @@ def _map_sap_heating(
     fuel_type = (
         _raw_fuel
         if _raw_fuel
-        else ("Electricity" if main.system_type.lower() in _ELECTRIC_SYSTEM_TYPES else _raw_fuel)
+        else (
+            "Electricity"
+            if main.system_type.lower() in _ELECTRIC_SYSTEM_TYPES
+            else _raw_fuel
+        )
     )
 
     return SapHeating(
@@ -1671,7 +1676,11 @@ def _map_sap_heating(
         secondary_fuel_type=secondary_fuel_type,
         secondary_heating_type=heating.secondary_heating.secondary_system,
         shower_outlets=shower_outlets,
-        cylinder_size=heating.water_heating.cylinder_size if heating.water_heating.cylinder_size != "No Cylinder" else None,
+        cylinder_size=(
+            heating.water_heating.cylinder_size
+            if heating.water_heating.cylinder_size != "No Cylinder"
+            else None
+        ),
         cylinder_insulation_type=heating.water_heating.insulation_type,
         cylinder_insulation_thickness_mm=heating.water_heating.insulation_thickness_mm,
         immersion_heating_type=heating.water_heating.immersion_type,
@@ -1772,7 +1781,11 @@ def _map_elmhurst_sap_heating(survey: ElmhurstSiteNotes) -> SapHeating:
         ],
         has_fixed_air_conditioning=survey.ventilation.fixed_space_cooling,
         shower_outlets=shower_outlets,
-        cylinder_size=None if not survey.water_heating.hot_water_cylinder_present else survey.water_heating.water_heating_code,
+        cylinder_size=(
+            None
+            if not survey.water_heating.hot_water_cylinder_present
+            else survey.water_heating.water_heating_code
+        ),
         water_heating_code=survey.water_heating.water_heating_sap_code,
     )