diff --git a/zokrates_core/src/proof_system/ark/gm17.rs b/zokrates_core/src/proof_system/ark/gm17.rs
index 9f59b590..f2e54f88 100644
--- a/zokrates_core/src/proof_system/ark/gm17.rs
+++ b/zokrates_core/src/proof_system/ark/gm17.rs
@@ -278,11 +278,8 @@ mod tests {
             .execute(program.clone(), &[Bls12_377Field::from(42)])
             .unwrap();
 
-        let proof = <Ark as Backend<Bls12_377Field, GM17>>::generate_proof(
-            program.into(),
-            witness,
-            keypair.pk,
-        );
+        let proof =
+            <Ark as Backend<Bls12_377Field, GM17>>::generate_proof(program, witness, keypair.pk);
         let ans = <Ark as Backend<Bls12_377Field, GM17>>::verify(keypair.vk, proof);
 
         assert!(ans);
diff --git a/zokrates_core/src/proof_system/ark/marlin.rs b/zokrates_core/src/proof_system/ark/marlin.rs
index be009f68..0918fbc7 100644
--- a/zokrates_core/src/proof_system/ark/marlin.rs
+++ b/zokrates_core/src/proof_system/ark/marlin.rs
@@ -216,19 +216,15 @@ mod tests {
 
         let srs = <Ark as UniversalBackend<Bls12_377Field, Marlin>>::universal_setup(5);
         let keypair =
-            <Ark as UniversalBackend<Bls12_377Field, Marlin>>::setup(srs, program.clone().into())
-                .unwrap();
+            <Ark as UniversalBackend<Bls12_377Field, Marlin>>::setup(srs, program.clone()).unwrap();
         let interpreter = Interpreter::default();
 
         let witness = interpreter
             .execute(program.clone(), &[Bls12_377Field::from(42)])
             .unwrap();
 
-        let proof = <Ark as Backend<Bls12_377Field, Marlin>>::generate_proof(
-            program.clone(),
-            witness,
-            keypair.pk,
-        );
+        let proof =
+            <Ark as Backend<Bls12_377Field, Marlin>>::generate_proof(program, witness, keypair.pk);
         let ans = <Ark as Backend<Bls12_377Field, Marlin>>::verify(keypair.vk, proof);
 
         assert!(ans);
diff --git a/zokrates_core/src/proof_system/bellman/groth16.rs b/zokrates_core/src/proof_system/bellman/groth16.rs
index 1070846b..3667e4c2 100644
--- a/zokrates_core/src/proof_system/bellman/groth16.rs
+++ b/zokrates_core/src/proof_system/bellman/groth16.rs
@@ -216,19 +216,15 @@ mod tests {
             )],
         };
 
-        let keypair =
-            <Bellman as NonUniversalBackend<Bn128Field, G16>>::setup(program.clone().into());
+        let keypair = <Bellman as NonUniversalBackend<Bn128Field, G16>>::setup(program.clone());
         let interpreter = Interpreter::default();
 
         let witness = interpreter
-            .execute(program.clone().into(), &[Bn128Field::from(42)])
+            .execute(program.clone(), &[Bn128Field::from(42)])
             .unwrap();
 
-        let proof = <Bellman as Backend<Bn128Field, G16>>::generate_proof(
-            program.into(),
-            witness,
-            keypair.pk,
-        );
+        let proof =
+            <Bellman as Backend<Bn128Field, G16>>::generate_proof(program, witness, keypair.pk);
         let ans = <Bellman as Backend<Bn128Field, G16>>::verify(keypair.vk, proof);
 
         assert!(ans);
diff --git a/zokrates_core/src/static_analysis/variable_write_remover.rs b/zokrates_core/src/static_analysis/variable_write_remover.rs
index ebb8d421..170a2c7c 100644
--- a/zokrates_core/src/static_analysis/variable_write_remover.rs
+++ b/zokrates_core/src/static_analysis/variable_write_remover.rs
@@ -327,11 +327,8 @@ impl<'ast> VariableWriteRemover {
                                     Type::FieldElement => {
                                         if i == head {
                                             Self::choose_many(
-                                                FieldElementExpression::element(
-                                                    base.clone(),
-                                                    head.clone(),
-                                                )
-                                                .into(),
+                                                FieldElementExpression::element(base.clone(), head)
+                                                    .into(),
                                                 tail.clone(),
                                                 new_expression.clone(),
                                                 statements,
@@ -343,8 +340,7 @@ impl<'ast> VariableWriteRemover {
                                     Type::Uint(..) => {
                                         if i == head {
                                             Self::choose_many(
-                                                UExpression::element(base.clone(), head.clone())
-                                                    .into(),
+                                                UExpression::element(base.clone(), head).into(),
                                                 tail.clone(),
                                                 new_expression.clone(),
                                                 statements,
@@ -356,11 +352,8 @@ impl<'ast> VariableWriteRemover {
                                     Type::Boolean => {
                                         if i == head {
                                             Self::choose_many(
-                                                BooleanExpression::element(
-                                                    base.clone(),
-                                                    head.clone(),
-                                                )
-                                                .into(),
+                                                BooleanExpression::element(base.clone(), head)
+                                                    .into(),
                                                 tail.clone(),
                                                 new_expression.clone(),
                                                 statements,
@@ -372,11 +365,7 @@ impl<'ast> VariableWriteRemover {
                                     Type::Array(..) => {
                                         if i == head {
                                             Self::choose_many(
-                                                ArrayExpression::element(
-                                                    base.clone(),
-                                                    head.clone(),
-                                                )
-                                                .into(),
+                                                ArrayExpression::element(base.clone(), head).into(),
                                                 tail.clone(),
                                                 new_expression.clone(),
                                                 statements,
@@ -388,11 +377,8 @@ impl<'ast> VariableWriteRemover {
                                     Type::Struct(..) => {
                                         if i == head {
                                             Self::choose_many(
-                                                StructExpression::element(
-                                                    base.clone(),
-                                                    head.clone(),
-                                                )
-                                                .into(),
+                                                StructExpression::element(base.clone(), head)
+                                                    .into(),
                                                 tail.clone(),
                                                 new_expression.clone(),
                                                 statements,
@@ -404,11 +390,7 @@ impl<'ast> VariableWriteRemover {
                                     Type::Tuple(..) => {
                                         if i == head {
                                             Self::choose_many(
-                                                TupleExpression::element(
-                                                    base.clone(),
-                                                    head.clone(),
-                                                )
-                                                .into(),
+                                                TupleExpression::element(base.clone(), head).into(),
                                                 tail.clone(),
                                                 new_expression.clone(),
                                                 statements,
diff --git a/zokrates_field/src/bn128.rs b/zokrates_field/src/bn128.rs
index 5b8988e1..7063b4cb 100644
--- a/zokrates_field/src/bn128.rs
+++ b/zokrates_field/src/bn128.rs
@@ -35,7 +35,7 @@ mod tests {
 
             let bits = FieldPrime::one().to_bits_be();
             assert_eq!(bits.len(), 254);
-            assert_eq!(bits[253], true);
+            assert!(bits[253]);
         }
 
         #[test]