diff --git a/zkevm-circuits/src/state_circuit.rs b/zkevm-circuits/src/state_circuit.rs
index 58e93a4996f..74b8f1f4cb4 100644
--- a/zkevm-circuits/src/state_circuit.rs
+++ b/zkevm-circuits/src/state_circuit.rs
@@ -540,7 +540,7 @@ impl<F: Field> SubCircuit<F> for StateCircuit<F> {
         ) = layouter.assign_region(
             || "state circuit",
             |mut region| {
-                // TODO optimimise RwMap::table_assignments_prepad calls from 3 times -> 1
+                // TODO optimise RwMap::table_assignments_prepad calls from 3 times -> 1
                 let padded_rows = config.rw_table.load_with_region(
                     &mut region,
                     &self.rows,
diff --git a/zkevm-circuits/src/table/chunk_ctx_table.rs b/zkevm-circuits/src/table/chunk_ctx_table.rs
index 8aee3d66e64..1f9bb859578 100644
--- a/zkevm-circuits/src/table/chunk_ctx_table.rs
+++ b/zkevm-circuits/src/table/chunk_ctx_table.rs
@@ -44,7 +44,7 @@ impl ChunkCtxTable {
     pub fn construct<F: Field>(meta: &mut ConstraintSystem<F>) -> Self {
         let (q_enable, tag, value) = (meta.selector(), meta.fixed_column(), meta.advice_column());
 
-        // constraint NextChunkIndex = CurrentChunkIndex + 1
+        // constrain NextChunkIndex = CurrentChunkIndex + 1
         meta.create_gate("NextChunkIndex = CurrentChunkIndex + 1", |meta| {
             let q_enable = meta.query_selector(q_enable);
             let value_cur = meta.query_advice(value, Rotation::cur());
diff --git a/zkevm-circuits/src/witness/chunk.rs b/zkevm-circuits/src/witness/chunk.rs
index b277098d285..92097737a1f 100755
--- a/zkevm-circuits/src/witness/chunk.rs
+++ b/zkevm-circuits/src/witness/chunk.rs
@@ -140,9 +140,8 @@ pub fn chunk_convert<F: Field>(
             if start == 0 {
                 (None, RwMap::from(skipped.take(size).collect::<Vec<_>>()))
             } else {
-                // here have `chunk.ctx.idx - 1` because each chunk first row are propagated from
-                // prev chunk. giving idx>0 th chunk, there will be (idx-1) placeholders cant' count
-                // in real order
+                // here we got `chunk.ctx.idx - 1` because each chunk first row are propagated from
+                // prev chunk. giving idx>0 th chunk, there will be (idx-1) placeholders.
                 let mut skipped = skipped.skip(start - 1 - (chunk.ctx.idx - 1));
                 let prev_chunk_last_by_address_rw = skipped.next();
                 (