diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/shf/ShfOperation.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/shf/ShfOperation.java
index 9c06349537..5b3a3cddb6 100644
--- a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/shf/ShfOperation.java
+++ b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/shf/ShfOperation.java
@@ -141,48 +141,48 @@ public void trace(Trace trace, int stamp) {
 
     for (int i = 0; i < this.maxCt(); i++) {
       final ByteChunks arg2HiByteChunks =
-          ByteChunks.fromBytes(UnsignedByte.of(this.arg2Hi().get(i)), this.mshp);
+          ByteChunks.fromBytes(UnsignedByte.of(this.arg2Hi().get(i)), mshp);
       final ByteChunks arg2LoByteChunks =
-          ByteChunks.fromBytes(UnsignedByte.of(this.arg2Lo().get(i)), this.mshp);
+          ByteChunks.fromBytes(UnsignedByte.of(this.arg2Lo().get(i)), mshp);
 
       trace
           .acc1(this.arg1Lo().slice(0, 1 + i))
           .acc2(this.arg2Hi().slice(0, 1 + i))
           .acc3(this.arg2Lo().slice(0, 1 + i))
-          .acc4(this.res.getResHi().slice(0, 1 + i))
-          .acc5(this.res.getResLo().slice(0, 1 + i))
+          .acc4(res.getResHi().slice(0, 1 + i))
+          .acc5(res.getResLo().slice(0, 1 + i))
           .arg1Hi(this.arg1Hi())
           .arg1Lo(this.arg1Lo())
           .arg2Hi(this.arg2Hi())
           .arg2Lo(this.arg2Lo());
 
-      if (this.isShiftRight) {
+      if (isShiftRight) {
         trace.bit1(i >= 1).bit2(i >= 2).bit3(i >= 4).bit4(i >= 8);
       } else {
         trace.bit1(i >= (16 - 1)).bit2(i >= (16 - 2)).bit3(i >= (16 - 4)).bit4(i >= (16 - 8));
       }
 
       trace
-          .bitB3(this.isBitB3)
-          .bitB4(this.isBitB4)
-          .bitB5(this.isBitB5)
-          .bitB6(this.isBitB6)
-          .bitB7(this.isBitB7)
+          .bitB3(isBitB3)
+          .bitB4(isBitB4)
+          .bitB5(isBitB5)
+          .bitB6(isBitB6)
+          .bitB7(isBitB7)
           .byte1(UnsignedByte.of(this.arg1Lo().get(i)))
           .byte2(UnsignedByte.of(this.arg2Hi().get(i)))
           .byte3(UnsignedByte.of(this.arg2Lo().get(i)))
-          .byte4(UnsignedByte.of(this.res.getResHi().get(i)))
-          .byte5(UnsignedByte.of(this.res.getResLo().get(i)))
-          .bits(this.bits.get(i))
+          .byte4(UnsignedByte.of(res.getResHi().get(i)))
+          .byte5(UnsignedByte.of(res.getResLo().get(i)))
+          .bits(bits.get(i))
           .counter((short) i)
-          .inst(UnsignedByte.of(this.opCode.byteValue()))
-          .known(this.isKnown)
-          .neg(this.isNegative)
-          .oneLineInstruction(this.isOneLineInstruction)
-          .low3(Bytes.of(this.low3.toInteger()))
-          .microShiftParameter((short) this.mshp.toInteger())
-          .resHi(this.res.getResHi())
-          .resLo(this.res.getResLo())
+          .inst(UnsignedByte.of(opCode.byteValue()))
+          .known(isKnown)
+          .neg(isNegative)
+          .oneLineInstruction(isOneLineInstruction)
+          .low3(Bytes.of(low3.toInteger()))
+          .microShiftParameter((short) mshp.toInteger())
+          .resHi(res.getResHi())
+          .resLo(res.getResLo())
           .leftAlignedSuffixHigh(arg2HiByteChunks.la())
           .rightAlignedPrefixHigh(arg2HiByteChunks.ra())
           .ones(arg2HiByteChunks.ones())
@@ -198,9 +198,9 @@ public void trace(Trace trace, int stamp) {
           .shb6Lo(shb.getShbLo()[6 - 3][i])
           .shb7Hi(shb.getShbHi()[7 - 3][i])
           .shb7Lo(shb.getShbLo()[7 - 3][i])
-          .shiftDirection(this.isShiftRight)
+          .shiftDirection(isShiftRight)
           .iomf(true)
-          .shiftStamp((short) stamp)
+          .shiftStamp(stamp)
           .validateRow();
     }
   }