diff --git a/src/solver/simulation/sim_structure_probleme_economique.h b/src/solver/simulation/sim_structure_probleme_economique.h
index 3311634d62..0aac104950 100644
--- a/src/solver/simulation/sim_structure_probleme_economique.h
+++ b/src/solver/simulation/sim_structure_probleme_economique.h
@@ -39,7 +39,7 @@
 
 class AdequacyPatchRuntimeData;
 
-typedef struct
+struct CORRESPONDANCES_DES_VARIABLES
 {
     int* NumeroDeVariableDeLInterconnexion;
     int* NumeroDeVariableCoutOrigineVersExtremiteDeLInterconnexion;
@@ -65,10 +65,9 @@ typedef struct
     int* NumeroDeVariableDuNombreDeGroupesQuiDemarrentDuPalierThermique;
     int* NumeroDeVariableDuNombreDeGroupesQuiSArretentDuPalierThermique;
     int* NumeroDeVariableDuNombreDeGroupesQuiTombentEnPanneDuPalierThermique;
+};
 
-} CORRESPONDANCES_DES_VARIABLES;
-
-typedef struct
+struct CORRESPONDANCES_DES_CONTRAINTES
 {
     int* NumeroDeContrainteDesBilansPays;
     int* NumeroDeContraintePourEviterLesChargesFictives;
@@ -84,22 +83,19 @@ typedef struct
     int* NumeroDeLaDeuxiemeContrainteDesContraintesDesGroupesQuiTombentEnPanne;
 
     int* NumeroDeContrainteDesNiveauxPays;
+};
 
-} CORRESPONDANCES_DES_CONTRAINTES;
-
-typedef struct
+struct CORRESPONDANCES_DES_CONTRAINTES_JOURNALIERES
 {
     int* NumeroDeContrainteDesContraintesCouplantes;
+};
 
-} CORRESPONDANCES_DES_CONTRAINTES_JOURNALIERES;
-
-typedef struct
+struct CORRESPONDANCES_DES_CONTRAINTES_HEBDOMADAIRES
 {
     int* NumeroDeContrainteDesContraintesCouplantes;
+};
 
-} CORRESPONDANCES_DES_CONTRAINTES_HEBDOMADAIRES;
-
-typedef struct
+struct VALEURS_DE_NTC_ET_RESISTANCES
 {
     double* ValeurDeNTCOrigineVersExtremite;
     double* ValeurDeNTCExtremiteVersOrigine;
@@ -110,27 +106,27 @@ typedef struct
     double* ValeurDuFluxDown;
 
     double* ResistanceApparente;
-} VALEURS_DE_NTC_ET_RESISTANCES;
+};
 
-typedef struct
+struct TRANSFER_BOUND_AND_LEVEL_MARKET_EDGE
 {
     double* TransferBoundMarketEdge;
     double* TransferLevelMarketEdge;
-} TRANSFER_BOUND_AND_LEVEL_MARKET_EDGE;
+};
 
-typedef struct
+struct TRANSFER_BOUND_AND_LEVEL_FLEX_UP_EDGE
 {
     double* TransferBoundFlexUpEdge;
     double* TransferLevelFlexUpEdge;
-} TRANSFER_BOUND_AND_LEVEL_FLEX_UP_EDGE;
+};
 
-typedef struct
+struct TRANSFER_BOUND_AND_LEVEL_FLEX_DOWN_EDGE
 {
     double* TransferBoundFlexDownEdge;
     double* TransferLevelFlexDownEdge;
-} TRANSFER_BOUND_AND_LEVEL_FLEX_DOWN_EDGE;
+};
 
-typedef struct
+struct CONTRAINTES_COUPLANTES
 {
     char TypeDeContrainteCouplante;
 
@@ -151,65 +147,64 @@ typedef struct
     int* NumeroDuPalierDispatch;
     int* OffsetTemporelSurLePalierDispatch;
     const char* NomDeLaContrainteCouplante;
-} CONTRAINTES_COUPLANTES;
+};
 
-typedef struct
+struct RESULTATS_CONTRAINTES_COUPLANTES
 {
     double* variablesDuales;
-} RESULTATS_CONTRAINTES_COUPLANTES;
+};
 
-typedef struct
+struct DEMAND_MARKET_POOL
 {
     double* TotalDemandOfMarketPool;
-} DEMAND_MARKET_POOL;
+};
 
-typedef struct
+struct DEMAND_FLEX_UP_POOL
 {
     double* FosteredDemandOfFlexUpPool;
-} DEMAND_FLEX_UP_POOL;
+};
 
-typedef struct
+struct DEMAND_FLEX_DOWN_POOL
 {
     double* FosteredDemandOfFlexDownPool;
-} DEMAND_FLEX_DOWN_POOL;
+};
 
-typedef struct
+struct BOUND_FLEX_UP_NODE
 {
     double* BoundFlexUpNode;
-} BOUND_FLEX_UP_NODE;
+};
 
-typedef struct
+struct BOUND_FLEX_DOWN_NODE
 {
     double* BoundFlexDownNode;
-} BOUND_FLEX_DOWN_NODE;
+};
 
-typedef struct
+struct LEVEL_FLEX_UP_NODE
 {
     double* LevelFlexUpNode;
-} LEVEL_FLEX_UP_NODE;
+};
 
-typedef struct
+struct LEVEL_FLEX_DOWN_NODE
 {
     double* LevelFlexDownNode;
-} LEVEL_FLEX_DOWN_NODE;
+};
 
-typedef struct
+struct CONSOMMATIONS_ABATTUES
 {
     double* ConsommationAbattueDuPays;
-} CONSOMMATIONS_ABATTUES;
+};
 
-typedef struct
+struct ALL_MUST_RUN_GENERATION
 {
     double* AllMustRunGenerationOfArea;
-} ALL_MUST_RUN_GENERATION;
+};
 
-typedef struct
+struct SOLDE_MOYEN_DES_ECHANGES
 {
     double* SoldeMoyenDuPays;
+};
 
-} SOLDE_MOYEN_DES_ECHANGES;
-
-typedef struct
+struct PDISP_ET_COUTS_HORAIRES_PAR_PALIER
 {
     double* PuissanceDisponibleDuPalierThermique;
 
@@ -228,10 +223,9 @@ typedef struct
 
     int* NombreMaxDeGroupesEnMarcheDuPalierThermique;
     int* NombreMinDeGroupesEnMarcheDuPalierThermique;
+};
 
-} PDISP_ET_COUTS_HORAIRES_PAR_PALIER;
-
-typedef struct
+struct PALIERS_THERMIQUES
 {
     int NombreDePaliersThermiques;
 
@@ -250,9 +244,9 @@ typedef struct
     double* PmaxDUnGroupeDuPalierThermique;
     int* DureeMinimaleDeMarcheDUnGroupeDuPalierThermique;
     int* DureeMinimaleDArretDUnGroupeDuPalierThermique;
-} PALIERS_THERMIQUES;
+};
 
-typedef struct
+struct ENERGIES_ET_PUISSANCES_HYDRAULIQUES
 {
     double* MaxEnergieHydrauParIntervalleOptimise;
 
@@ -302,7 +296,7 @@ typedef struct
                                  100, should be made dynamic)*/
     double* InflowForTimeInterval; /*  Energy input to the reservoir, used to in the bounding
                                       constraint on final level*/
-} ENERGIES_ET_PUISSANCES_HYDRAULIQUES;
+};
 
 class computeTimeStepLevel
 {
@@ -383,13 +377,13 @@ class computeTimeStepLevel
     }
 };
 
-typedef struct
+struct RESERVE_JMOINS1
 {
     double* ReserveHoraireJMoins1 = nullptr;
     double* ReserveHoraireJMoins1Ref = nullptr;
-} RESERVE_JMOINS1;
+};
 
-typedef struct
+struct PRODUCTION_THERMIQUE_OPTIMALE
 {
     double* ProductionThermiqueDuPalier;
 
@@ -402,10 +396,9 @@ typedef struct
     double* NombreDeGroupesQuiSArretentDuPalier;
 
     double* NombreDeGroupesQuiTombentEnPanneDuPalier;
+};
 
-} PRODUCTION_THERMIQUE_OPTIMALE;
-
-typedef struct
+struct RESULTATS_HORAIRES
 {
     double* ValeursHorairesDeDefaillancePositive;
     double* ValeursHorairesDENS;                  // adq patch domestic unsupplied energy
@@ -434,9 +427,9 @@ typedef struct
 
     double* CoutsMarginauxHoraires;
     PRODUCTION_THERMIQUE_OPTIMALE** ProductionThermique;
-} RESULTATS_HORAIRES;
+};
 
-typedef struct
+struct COUTS_DE_TRANSPORT
 {
     char IntercoGereeAvecDesCouts;
     char IntercoGereeAvecLoopFlow;
@@ -445,18 +438,17 @@ typedef struct
 
     double* CoutDeTransportOrigineVersExtremiteRef;
     double* CoutDeTransportExtremiteVersOrigineRef;
+};
 
-} COUTS_DE_TRANSPORT;
-
-typedef struct
+struct VARIABLES_DUALES_INTERCONNEXIONS
 {
     double* VariableDualeParInterconnexion = nullptr;
-} VARIABLES_DUALES_INTERCONNEXIONS;
+};
 
-typedef struct
+struct COUTS_MARGINAUX_ZONES_DE_RESERVE
 {
     double* CoutsMarginauxHorairesDeLaReserveParZone = nullptr;
-} COUTS_MARGINAUX_ZONES_DE_RESERVE;
+};
 
 struct AdequacyPatchParameters
 {
@@ -520,7 +512,8 @@ struct PROBLEME_HEBDO
     char* DefaillanceNegativeUtiliserHydro = nullptr;
     char* DefaillanceNegativeUtiliserConsoAbattue = nullptr;
 
-    char TypeDOptimisation = OPTIMISATION_LINEAIRE; // OPTIMISATION_LINEAIRE or OPTIMISATION_QUADRATIQUE
+    char TypeDOptimisation
+      = OPTIMISATION_LINEAIRE; // OPTIMISATION_LINEAIRE or OPTIMISATION_QUADRATIQUE
 
     double** BruitSurCoutHydraulique = nullptr;
 
@@ -542,8 +535,10 @@ struct PROBLEME_HEBDO
 
     CORRESPONDANCES_DES_VARIABLES** CorrespondanceVarNativesVarOptim = nullptr;
     CORRESPONDANCES_DES_CONTRAINTES** CorrespondanceCntNativesCntOptim = nullptr;
-    CORRESPONDANCES_DES_CONTRAINTES_JOURNALIERES** CorrespondanceCntNativesCntOptimJournalieres = nullptr;
-    CORRESPONDANCES_DES_CONTRAINTES_HEBDOMADAIRES** CorrespondanceCntNativesCntOptimHebdomadaires = nullptr;
+    CORRESPONDANCES_DES_CONTRAINTES_JOURNALIERES** CorrespondanceCntNativesCntOptimJournalieres
+      = nullptr;
+    CORRESPONDANCES_DES_CONTRAINTES_HEBDOMADAIRES** CorrespondanceCntNativesCntOptimHebdomadaires
+      = nullptr;
 
     RESERVE_JMOINS1** ReserveJMoins1 = nullptr;