diff --git a/light-poseidon/src/lib.rs b/light-poseidon/src/lib.rs
index 9b173df..58e9376 100644
--- a/light-poseidon/src/lib.rs
+++ b/light-poseidon/src/lib.rs
@@ -455,7 +455,7 @@ pub fn validate_bytes_length<F>(input: &[u8]) -> Result<&[u8], PoseidonError>
 where
     F: PrimeField,
 {
-    let modulus_bytes_len = ((F::MODULUS_BIT_SIZE + 7) / 8) as usize;
+    let modulus_bytes_len = F::MODULUS_BIT_SIZE.div_ceil(8) as usize;
     if input.is_empty() {
         return Err(PoseidonError::EmptyInput);
     }
diff --git a/light-poseidon/src/parameters/bn254_x5.rs b/light-poseidon/src/parameters/bn254_x5.rs
index b755704..3ef28c5 100644
--- a/light-poseidon/src/parameters/bn254_x5.rs
+++ b/light-poseidon/src/parameters/bn254_x5.rs
@@ -842,14 +842,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
                 ])),
             ],
         ];
-        return Ok(crate::PoseidonParameters::new(
+        Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[0],
             t.into(),
             ALPHA,
-        ));
+        ))
     } else if 3 == t {
         let ark = vec![
             F::from(ark_ff::BigInteger256::new([
@@ -2085,14 +2085,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
                 ])),
             ],
         ];
-        return Ok(crate::PoseidonParameters::new(
+        Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[1],
             t.into(),
             ALPHA,
-        ));
+        ))
     } else if 4 == t {
         let ark = vec![
             F::from(ark_ff::BigInteger256::new([
@@ -3738,14 +3738,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
                 ])),
             ],
         ];
-        return Ok(crate::PoseidonParameters::new(
+        Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[2],
             t.into(),
             ALPHA,
-        ));
+        ))
     } else if 5 == t {
         let ark = vec![
             F::from(ark_ff::BigInteger256::new([
@@ -5951,14 +5951,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
                 ])),
             ],
         ];
-        return Ok(crate::PoseidonParameters::new(
+        Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[3],
             t.into(),
             ALPHA,
-        ));
+        ))
     } else if 6 == t {
         let ark = vec![
             F::from(ark_ff::BigInteger256::new([
@@ -8640,14 +8640,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
                 ])),
             ],
         ];
-        return Ok(crate::PoseidonParameters::new(
+        Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[4],
             t.into(),
             ALPHA,
-        ));
+        ))
     } else if 7 == t {
         let ark = vec![
             F::from(ark_ff::BigInteger256::new([
@@ -11943,14 +11943,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
                 ])),
             ],
         ];
-        return Ok(crate::PoseidonParameters::new(
+        Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[5],
             t.into(),
             ALPHA,
-        ));
+        ))
     } else if 8 == t {
         let ark = vec![
             F::from(ark_ff::BigInteger256::new([
@@ -15812,14 +15812,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
                 ])),
             ],
         ];
-        return Ok(crate::PoseidonParameters::new(
+        Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[6],
             t.into(),
             ALPHA,
-        ));
+        ))
     } else if 9 == t {
         let ark = vec![
             F::from(ark_ff::BigInteger256::new([
@@ -20163,14 +20163,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
                 ])),
             ],
         ];
-        return Ok(crate::PoseidonParameters::new(
+        Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[7],
             t.into(),
             ALPHA,
-        ));
+        ))
     } else if 10 == t {
         let ark = vec![
             F::from(ark_ff::BigInteger256::new([
@@ -24876,14 +24876,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
                 ])),
             ],
         ];
-        return Ok(crate::PoseidonParameters::new(
+        Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[8],
             t.into(),
             ALPHA,
-        ));
+        ))
     } else if 11 == t {
         let ark = vec![
             F::from(ark_ff::BigInteger256::new([
@@ -30521,14 +30521,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
                 ])),
             ],
         ];
-        return Ok(crate::PoseidonParameters::new(
+        Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[9],
             t.into(),
             ALPHA,
-        ));
+        ))
     } else if 12 == t {
         let ark = vec![
             F::from(ark_ff::BigInteger256::new([
@@ -36318,14 +36318,14 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
                 ])),
             ],
         ];
-        return Ok(crate::PoseidonParameters::new(
+        Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[10],
             t.into(),
             ALPHA,
-        ));
+        ))
     } else if 13 == t {
         let ark = vec![
             F::from(ark_ff::BigInteger256::new([
@@ -43065,18 +43065,18 @@ pub fn get_poseidon_parameters<F: PrimeField + std::convert::From<ark_ff::BigInt
                 ])),
             ],
         ];
-        return Ok(crate::PoseidonParameters::new(
+        Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[11],
             t.into(),
             ALPHA,
-        ));
+        ))
     } else {
-        return Err(PoseidonError::InvalidWidthCircom {
+        Err(PoseidonError::InvalidWidthCircom {
             width: t as usize,
             max_limit: 13usize,
-        });
+        })
     }
 }
diff --git a/xtask/src/generate_parameters.rs b/xtask/src/generate_parameters.rs
index 24df934..2fccf18 100644
--- a/xtask/src/generate_parameters.rs
+++ b/xtask/src/generate_parameters.rs
@@ -210,24 +210,24 @@ pub fn generate_parameters(_opts: Options) -> Result<(), anyhow::Error> {
             }
         }
         code += &format!(
-            "return Ok(crate::PoseidonParameters::new(
+            "Ok(crate::PoseidonParameters::new(
             ark,
             mds,
             FULL_ROUNDS,
             PARTIAL_ROUNDS[{}],
             t.into(),
             ALPHA,
-            ));\n",
+            ))\n",
             t - 2
         );
 
         code += "\t}\n";
     }
     code += "else {
-        return Err(PoseidonError::InvalidWidthCircom {
+        Err(PoseidonError::InvalidWidthCircom {
             width: t as usize,
             max_limit: 13usize,
-        });\n
+        })\n
     }";
     code += "}\n";