diff --git a/src/deserialization/traces.cairo b/src/deserialization/traces.cairo
index 0c449722b..b13e6af97 100644
--- a/src/deserialization/traces.cairo
+++ b/src/deserialization/traces.cairo
@@ -1,7 +1,7 @@
 use cairo_verifier::{
     // === DEX BEGIN ===
     // air::layouts::dex::{
-    //     traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
+    // traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
     // },
     // === DEX END ===
     // === RECURSIVE BEGIN ===
@@ -11,17 +11,17 @@ use cairo_verifier::{
     // === RECURSIVE END ===
     // === RECURSIVE_WITH_POSEIDON BEGIN ===
     // air::layouts::recursive_with_poseidon::{
-    //     traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
+    // traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
     // },
     // === RECURSIVE_WITH_POSEIDON END ===
     // === SMALL BEGIN ===
     // air::layouts::small::{
-    //     traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
+    // traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
     // },
     // === SMALL END ===
     // === STARKNET BEGIN ===
     // air::layouts::starknet::{
-    //     traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
+    // traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
     // },
     // === STARKNET END ===
     deserialization::{
diff --git a/src/lib.cairo b/src/lib.cairo
index b1e2969a5..7b3f3d6de 100644
--- a/src/lib.cairo
+++ b/src/lib.cairo
@@ -25,16 +25,16 @@ use cairo_verifier::{
     // === DEX END ===
     // === RECURSIVE BEGIN ===
     air::layouts::recursive::public_input::RecursivePublicInputImpl,
-    // === RECURSIVE END ===
-    // === RECURSIVE_WITH_POSEIDON BEGIN ===
-    // air::layouts::recursive_with_poseidon::public_input::RecursiveWithPoseidonPublicInputImpl,
-    // === RECURSIVE_WITH_POSEIDON END ===
-    // === SMALL BEGIN ===
-    // air::layouts::small::public_input::SmallPublicInputImpl,
-    // === SMALL END ===
-    // === STARKNET BEGIN ===
-    // air::layouts::starknet::public_input::StarknetPublicInputImpl,
-    // === STARKNET END ===
+// === RECURSIVE END ===
+// === RECURSIVE_WITH_POSEIDON BEGIN ===
+// air::layouts::recursive_with_poseidon::public_input::RecursiveWithPoseidonPublicInputImpl,
+// === RECURSIVE_WITH_POSEIDON END ===
+// === SMALL BEGIN ===
+// air::layouts::small::public_input::SmallPublicInputImpl,
+// === SMALL END ===
+// === STARKNET BEGIN ===
+// air::layouts::starknet::public_input::StarknetPublicInputImpl,
+// === STARKNET END ===
 };
 
 const SECURITY_BITS: felt252 = 50;
diff --git a/src/oods.cairo b/src/oods.cairo
index 3583c5e00..cdb6ee111 100644
--- a/src/oods.cairo
+++ b/src/oods.cairo
@@ -2,37 +2,37 @@ use cairo_verifier::{
     common::array_extend::ArrayExtendTrait,
     // === DEX BEGIN ===
     // air::layouts::dex::{
-    //     AIRComposition, AIROods, DexAIRCompositionImpl, DexAIROodsImpl,
-    //     global_values::InteractionElements, public_input::PublicInput, traces::TracesDecommitment,
-    //     constants::CONSTRAINT_DEGREE,
+    // AIRComposition, AIROods, DexAIRCompositionImpl, DexAIROodsImpl,
+    // global_values::InteractionElements, public_input::PublicInput, traces::TracesDecommitment,
+    // constants::CONSTRAINT_DEGREE,
     // },
     // === DEX END ===
     // === RECURSIVE BEGIN ===
-        air::layouts::recursive::{
-            AIRComposition, AIROods, RecursiveAIRCompositionImpl, RecursiveAIROodsImpl,
-            global_values::InteractionElements, public_input::PublicInput, traces::TracesDecommitment,
-            constants::CONSTRAINT_DEGREE,
-        },
+    air::layouts::recursive::{
+        AIRComposition, AIROods, RecursiveAIRCompositionImpl, RecursiveAIROodsImpl,
+        global_values::InteractionElements, public_input::PublicInput, traces::TracesDecommitment,
+        constants::CONSTRAINT_DEGREE,
+    },
     // === RECURSIVE END ===
     // === RECURSIVE_WITH_POSEIDON BEGIN ===
     // air::layouts::recursive_with_poseidon::{
-    //     AIRComposition, AIROods, RecursiveWithPoseidonAIRCompositionImpl, RecursiveWithPoseidonAIROodsImpl,
-    //     global_values::InteractionElements, public_input::PublicInput, traces::TracesDecommitment,
-    //     constants::CONSTRAINT_DEGREE,
+    // AIRComposition, AIROods, RecursiveWithPoseidonAIRCompositionImpl,
+    // RecursiveWithPoseidonAIROodsImpl, global_values::InteractionElements,
+    // public_input::PublicInput, traces::TracesDecommitment, constants::CONSTRAINT_DEGREE,
     // },
     // === RECURSIVE_WITH_POSEIDON END ===
     // === SMALL BEGIN ===
     // air::layouts::small::{
-    //     AIRComposition, AIROods, SmallAIRCompositionImpl, SmallAIROodsImpl,
-    //     global_values::InteractionElements, public_input::PublicInput, traces::TracesDecommitment,
-    //     constants::CONSTRAINT_DEGREE,
+    // AIRComposition, AIROods, SmallAIRCompositionImpl, SmallAIROodsImpl,
+    // global_values::InteractionElements, public_input::PublicInput, traces::TracesDecommitment,
+    // constants::CONSTRAINT_DEGREE,
     // },
     // === SMALL END ===
     // === STARKNET BEGIN ===
     // air::layouts::starknet::{
-    //     AIRComposition, AIROods, StarknetAIRCompositionImpl, StarknetAIROodsImpl,
-    //     global_values::InteractionElements, public_input::PublicInput, traces::TracesDecommitment,
-    //     constants::CONSTRAINT_DEGREE,
+    // AIRComposition, AIROods, StarknetAIRCompositionImpl, StarknetAIROodsImpl,
+    // global_values::InteractionElements, public_input::PublicInput, traces::TracesDecommitment,
+    // constants::CONSTRAINT_DEGREE,
     // },
     // === STARKNET END ===
     table_commitment::table_commitment::TableDecommitment
diff --git a/src/stark.cairo b/src/stark.cairo
index 3616241dd..944b14d5f 100644
--- a/src/stark.cairo
+++ b/src/stark.cairo
@@ -9,39 +9,40 @@ use cairo_verifier::{
         public_input::{PublicInput, get_public_input_hash},
         // === DEX BEGIN ===
         // layouts::dex::{
-        //     traces::{TracesConfig, TracesConfigTrait}, public_input::DexPublicInputImpl,
-        //     traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
-        //     constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND}
-        // }
+        // traces::{TracesConfig, TracesConfigTrait}, public_input::DexPublicInputImpl,
+        // traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
+        // constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND}
+        // },
         // === DEX END ===
         // === RECURSIVE BEGIN ===
         layouts::recursive::{
             traces::{TracesConfig, TracesConfigTrait}, public_input::RecursivePublicInputImpl,
             traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
-            constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND}
-        }
-        // === RECURSIVE END ===
-        // === RECURSIVE_WITH_POSEIDON BEGIN ===
-        // layouts::recursive_with_poseidon::{
-        //     traces::{TracesConfig, TracesConfigTrait}, public_input::RecursiveWithPoseidonPublicInputImpl,
-        //     traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
-        //     constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND}
-        // }
-        // === RECURSIVE_WITH_POSEIDON END ===
-        // === SMALL BEGIN ===
-        // layouts::small::{
-        //     traces::{TracesConfig, TracesConfigTrait}, public_input::SmallPublicInputImpl,
-        //     traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
-        //     constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND}
-        // }
-        // === SMALL END ===
-        // === STARKNET BEGIN ===
-        // layouts::starknet::{
-        //     traces::{TracesConfig, TracesConfigTrait}, public_input::StarknetPublicInputImpl,
-        //     traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
-        //     constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND}
-        // }
-        // === STARKNET END ===
+            constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND},
+        },
+    // === RECURSIVE END ===
+    // === RECURSIVE_WITH_POSEIDON BEGIN ===
+    // layouts::recursive_with_poseidon::{
+    // traces::{TracesConfig, TracesConfigTrait},
+    // public_input::RecursiveWithPoseidonPublicInputImpl,
+    // traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
+    // constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND}
+    // },
+    // === RECURSIVE_WITH_POSEIDON END ===
+    // === SMALL BEGIN ===
+    // layouts::small::{
+    // traces::{TracesConfig, TracesConfigTrait}, public_input::SmallPublicInputImpl,
+    // traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
+    // constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND}
+    // },
+    // === SMALL END ===
+    // === STARKNET BEGIN ===
+    // layouts::starknet::{
+    // traces::{TracesConfig, TracesConfigTrait}, public_input::StarknetPublicInputImpl,
+    // traces::{TracesUnsentCommitment, TracesCommitment, TracesDecommitment, TracesWitness},
+    // constants::{NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND}
+    // },
+    // === STARKNET END ===
     },
     channel::channel::{Channel, ChannelImpl},
     fri::{
diff --git a/src/stark/stark_commit.cairo b/src/stark/stark_commit.cairo
index e21e263ff..b50415c6d 100644
--- a/src/stark/stark_commit.cairo
+++ b/src/stark/stark_commit.cairo
@@ -1,8 +1,8 @@
 use cairo_verifier::{
     // === DEX BEGIN ===
     // air::layouts::dex::{
-    //     constants::{CONSTRAINT_DEGREE, N_CONSTRAINTS, MASK_SIZE}, public_input::PublicInput,
-    //     traces::traces_commit,
+    // constants::{CONSTRAINT_DEGREE, N_CONSTRAINTS, MASK_SIZE}, public_input::PublicInput,
+    // traces::traces_commit,
     // },
     // === DEX END ===
     // === RECURSIVE BEGIN ===
@@ -13,20 +13,20 @@ use cairo_verifier::{
     // === RECURSIVE END ===
     // === RECURSIVE_WITH_POSEIDON BEGIN ===
     // air::layouts::recursive_with_poseidon::{
-    //     constants::{CONSTRAINT_DEGREE, N_CONSTRAINTS, MASK_SIZE}, public_input::PublicInput,
-    //     traces::traces_commit,
+    // constants::{CONSTRAINT_DEGREE, N_CONSTRAINTS, MASK_SIZE}, public_input::PublicInput,
+    // traces::traces_commit,
     // },
     // === RECURSIVE_WITH_POSEIDON END ===
     // === SMALL BEGIN ===
     // air::layouts::small::{
-    //     constants::{CONSTRAINT_DEGREE, N_CONSTRAINTS, MASK_SIZE}, public_input::PublicInput,
-    //     traces::traces_commit,
+    // constants::{CONSTRAINT_DEGREE, N_CONSTRAINTS, MASK_SIZE}, public_input::PublicInput,
+    // traces::traces_commit,
     // },
     // === SMALL END ===
     // === STARKNET BEGIN ===
     // air::layouts::starknet::{
-    //     constants::{CONSTRAINT_DEGREE, N_CONSTRAINTS, MASK_SIZE}, public_input::PublicInput,
-    //     traces::traces_commit,
+    // constants::{CONSTRAINT_DEGREE, N_CONSTRAINTS, MASK_SIZE}, public_input::PublicInput,
+    // traces::traces_commit,
     // },
     // === STARKNET END ===
     channel::channel::{Channel, ChannelTrait}, common::powers_array::powers_array,
diff --git a/src/stark/stark_verify.cairo b/src/stark/stark_verify.cairo
index 279184e1a..1ac2d1bc2 100644
--- a/src/stark/stark_verify.cairo
+++ b/src/stark/stark_verify.cairo
@@ -3,8 +3,7 @@ use cairo_verifier::{
     fri::fri::{FriDecommitment, fri_verify},
     stark::{StarkUnsentCommitment, StarkWitness, StarkCommitment},
     // === DEX BEGIN ===
-    // air::layouts::dex::traces::traces_decommit,
-    // === DEX END ===
+    // air::layouts::dex::traces::traces_decommit, // === DEX END ===
     // === RECURSIVE BEGIN ===
     air::layouts::recursive::traces::traces_decommit,
     // === RECURSIVE END ===