diff --git a/rules/build_sector.smk b/rules/build_sector.smk
index da8a60f9..2d6c8263 100644
--- a/rules/build_sector.smk
+++ b/rules/build_sector.smk
@@ -406,24 +406,38 @@ rule build_ammonia_production:
 rule build_industry_sector_ratios:
     params:
         industry={
-            "H2_DRI":config["industry"]["H2_DRI"],
-            "elec_DRI":config["industry"]["elec_DRI"],
-            "HVC_production_today":config["industry"]["HVC_production_today"],
-            "petrochemical_process_emissions":config["industry"]["petrochemical_process_emissions"],
-            "NH3_process_emissions":config["industry"]["NH3_process_emissions"],
-            "MWh_CH4_per_tNH3_SMR":config["industry"]["MWh_CH4_per_tNH3_SMR"],
-            "MWh_elec_per_tNH3_SMR":config["industry"]["MWh_elec_per_tNH3_SMR"],
-            "chlorine_production_today":config["industry"]["chlorine_production_today"],
-            "MWh_H2_per_tCl":config["industry"]["MWh_H2_per_tCl"],
-            "MWh_elec_per_tCl":config["industry"]["MWh_elec_per_tCl"],
-            "methanol_production_today":config["industry"]["methanol_production_today"],
-            "MWh_CH4_per_tMeOH":config["industry"]["MWh_CH4_per_tMeOH"],
-            "MWh_elec_per_tMeOH":config["industry"]["MWh_elec_per_tMeOH"],
-            "MWh_elec_per_tHVC_mechanical_recycling":config["industry"]["MWh_elec_per_tHVC_mechanical_recycling"],
-            "MWh_elec_per_tHVC_chemical_recycling":config["industry"]["MWh_elec_per_tHVC_chemical_recycling"],
-            "MWh_NH3_per_tNH3":config["industry"]["MWh_NH3_per_tNH3"],
-            "MWh_H2_per_tNH3_electrolysis":config["industry"]["MWh_H2_per_tNH3_electrolysis"],
-            "MWh_elec_per_tNH3_electrolysis":config["industry"]["MWh_elec_per_tNH3_electrolysis"]
+            "H2_DRI": config["industry"]["H2_DRI"],
+            "elec_DRI": config["industry"]["elec_DRI"],
+            "HVC_production_today": config["industry"]["HVC_production_today"],
+            "petrochemical_process_emissions": config["industry"][
+            "petrochemical_process_emissions"
+            ],
+            "NH3_process_emissions": config["industry"]["NH3_process_emissions"],
+            "MWh_CH4_per_tNH3_SMR": config["industry"]["MWh_CH4_per_tNH3_SMR"],
+            "MWh_elec_per_tNH3_SMR": config["industry"]["MWh_elec_per_tNH3_SMR"],
+            "chlorine_production_today": config["industry"][
+            "chlorine_production_today"
+            ],
+            "MWh_H2_per_tCl": config["industry"]["MWh_H2_per_tCl"],
+            "MWh_elec_per_tCl": config["industry"]["MWh_elec_per_tCl"],
+            "methanol_production_today": config["industry"][
+            "methanol_production_today"
+            ],
+            "MWh_CH4_per_tMeOH": config["industry"]["MWh_CH4_per_tMeOH"],
+            "MWh_elec_per_tMeOH": config["industry"]["MWh_elec_per_tMeOH"],
+            "MWh_elec_per_tHVC_mechanical_recycling": config["industry"][
+            "MWh_elec_per_tHVC_mechanical_recycling"
+            ],
+            "MWh_elec_per_tHVC_chemical_recycling": config["industry"][
+            "MWh_elec_per_tHVC_chemical_recycling"
+            ],
+            "MWh_NH3_per_tNH3": config["industry"]["MWh_NH3_per_tNH3"],
+            "MWh_H2_per_tNH3_electrolysis": config["industry"][
+            "MWh_H2_per_tNH3_electrolysis"
+            ],
+            "MWh_elec_per_tNH3_electrolysis": config["industry"][
+            "MWh_elec_per_tNH3_electrolysis"
+            ],
         },
         sector_amonia=config["sector"].get("ammonia", False),
     input:
@@ -447,10 +461,14 @@ rule build_industry_sector_ratios:
 rule build_industrial_production_per_country:
     params:
         industry={
-            "reference_year":config["industry"]["reference_year"],
-            "HVC_production_today":config["industry"]["HVC_production_today"],
-            "chlorine_production_today":config["industry"]["chlorine_production_today"],
-            "methanol_production_today":config["industry"]["methanol_production_today"]
+            "reference_year": config["industry"]["reference_year"],
+            "HVC_production_today": config["industry"]["HVC_production_today"],
+            "chlorine_production_today": config["industry"][
+            "chlorine_production_today"
+            ],
+            "methanol_production_today": config["industry"][
+            "methanol_production_today"
+            ],
         },
         countries=config["countries"],
     input:
@@ -476,12 +494,16 @@ rule build_industrial_production_per_country:
 rule build_industrial_production_per_country_tomorrow:
     params:
         industry={
-            "St_primary_fraction":config["industry"]["St_primary_fraction"],
-            "DRI_fraction":config["industry"]["DRI_fraction"],
-            "Al_primary_fraction":config["industry"]["Al_primary_fraction"],
-            "HVC_mechanical_recycling_fraction":config["industry"]["HVC_mechanical_recycling_fraction"],
-            "HVC_chemical_recycling_fraction":config["industry"]["HVC_chemical_recycling_fraction"],
-            "HVC_primary_fraction":config["industry"]["HVC_primary_fraction"]
+            "St_primary_fraction": config["industry"]["St_primary_fraction"],
+            "DRI_fraction": config["industry"]["DRI_fraction"],
+            "Al_primary_fraction": config["industry"]["Al_primary_fraction"],
+            "HVC_mechanical_recycling_fraction": config["industry"][
+            "HVC_mechanical_recycling_fraction"
+            ],
+            "HVC_chemical_recycling_fraction": config["industry"][
+            "HVC_chemical_recycling_fraction"
+            ],
+            "HVC_primary_fraction": config["industry"]["HVC_primary_fraction"],
         },
     input:
         industrial_production_per_country=RESOURCES
@@ -587,10 +609,10 @@ rule build_industrial_energy_demand_per_country_today:
     params:
         countries=config["countries"],
         industry={
-            "reference_year":config["industry"].get("reference_year", 2015),
-            "MWh_CH4_per_tNH3_SMR":config["industry"]["MWh_CH4_per_tNH3_SMR"],
-            "MWh_elec_per_tNH3_SMR":config["industry"]["MWh_elec_per_tNH3_SMR"],
-            "MWh_NH3_per_tNH3":config["industry"]["MWh_NH3_per_tNH3"]
+            "reference_year": config["industry"].get("reference_year", 2015),
+            "MWh_CH4_per_tNH3_SMR": config["industry"]["MWh_CH4_per_tNH3_SMR"],
+            "MWh_elec_per_tNH3_SMR": config["industry"]["MWh_elec_per_tNH3_SMR"],
+            "MWh_NH3_per_tNH3": config["industry"]["MWh_NH3_per_tNH3"],
         },
     input:
         jrc="data/jrc-idees-2015",
@@ -747,10 +769,16 @@ rule prepare_sector_network:
         costs=config["costs"],
         sector=config["sector"],
         industry={
-            "MWh_elec_per_tNH3_electrolysis":config["industry"]["MWh_elec_per_tNH3_electrolysis"],
-            "MWh_NH3_per_tNH3":config["industry"]["MWh_NH3_per_tNH3"],
-            "MWh_H2_per_tNH3_electrolysis":config["industry"]["MWh_H2_per_tNH3_electrolysis"],
-            "MWh_NH3_per_MWh_H2_cracker":config["industry"]["MWh_NH3_per_MWh_H2_cracker"]
+            "MWh_elec_per_tNH3_electrolysis": config["industry"][
+            "MWh_elec_per_tNH3_electrolysis"
+            ],
+            "MWh_NH3_per_tNH3": config["industry"]["MWh_NH3_per_tNH3"],
+            "MWh_H2_per_tNH3_electrolysis": config["industry"][
+            "MWh_H2_per_tNH3_electrolysis"
+            ],
+            "MWh_NH3_per_MWh_H2_cracker": config["industry"][
+            "MWh_NH3_per_MWh_H2_cracker"
+            ],
         },
         pypsa_eur=config["pypsa_eur"],
         length_factor=config["lines"]["length_factor"],
diff --git a/scripts/cluster_network.py b/scripts/cluster_network.py
index 3cfbd214..b86bb225 100644
--- a/scripts/cluster_network.py
+++ b/scripts/cluster_network.py
@@ -478,9 +478,7 @@ if __name__ == "__main__":
     aggregate_carriers = set(n.generators.carrier) - set(exclude_carriers)
     if snakemake.wildcards.clusters.endswith("m"):
         n_clusters = int(snakemake.wildcards.clusters[:-1])
-        conventional = set(
-            snakemake.params["conventional_carriers"]
-        )
+        conventional = set(snakemake.params["conventional_carriers"])
         aggregate_carriers = conventional.intersection(aggregate_carriers)
     elif snakemake.wildcards.clusters == "all":
         n_clusters = len(n.buses)