diff --git a/lib/Conversion/CGGIToTfheRust/CGGIToTfheRust.cpp b/lib/Conversion/CGGIToTfheRust/CGGIToTfheRust.cpp
index e0078cba1..4954b3c08 100644
--- a/lib/Conversion/CGGIToTfheRust/CGGIToTfheRust.cpp
+++ b/lib/Conversion/CGGIToTfheRust/CGGIToTfheRust.cpp
@@ -84,9 +84,9 @@ int widthFromEncodingAttr(Attribute encoding) {
       });
 }
 
-class PassTypeConverter : public TypeConverter {
+class CGGIToTfheRustTypeConverter : public TypeConverter {
  public:
-  PassTypeConverter(MLIRContext *ctx) {
+  CGGIToTfheRustTypeConverter(MLIRContext *ctx) {
     addConversion([](Type type) { return type; });
     addConversion([ctx](lwe::LWECiphertextType type) -> Type {
       int width = widthFromEncodingAttr(type.getEncoding());
@@ -402,7 +402,7 @@ class CGGIToTfheRust : public impl::CGGIToTfheRustBase<CGGIToTfheRust> {
     MLIRContext *context = &getContext();
     auto *op = getOperation();
 
-    PassTypeConverter typeConverter(context);
+    CGGIToTfheRustTypeConverter typeConverter(context);
     RewritePatternSet patterns(context);
     ConversionTarget target(*context);
     addStructuralConversionPatterns(typeConverter, patterns, target);
diff --git a/lib/Conversion/CGGIToTfheRustBool/CGGIToTfheRustBool.cpp b/lib/Conversion/CGGIToTfheRustBool/CGGIToTfheRustBool.cpp
index 3a4716fb4..af2b6342a 100644
--- a/lib/Conversion/CGGIToTfheRustBool/CGGIToTfheRustBool.cpp
+++ b/lib/Conversion/CGGIToTfheRustBool/CGGIToTfheRustBool.cpp
@@ -32,9 +32,9 @@ namespace mlir::heir {
 #define GEN_PASS_DEF_CGGITOTFHERUSTBOOL
 #include "include/Conversion/CGGIToTfheRustBool/CGGIToTfheRustBool.h.inc"
 
-class BoolPassTypeConverter : public TypeConverter {
+class CGGIToTfheRustBoolTypeConverter : public TypeConverter {
  public:
-  BoolPassTypeConverter(MLIRContext *ctx) {
+  CGGIToTfheRustBoolTypeConverter(MLIRContext *ctx) {
     addConversion([](Type type) { return type; });
     addConversion([ctx](lwe::LWECiphertextType type) -> Type {
       return tfhe_rust_bool::EncryptedBoolType::get(ctx);
@@ -131,35 +131,12 @@ struct AddBoolServerKeyArg : public OpConversionPattern<func::FuncOp> {
   }
 };
 
-struct ConvertBoolAndOp : public OpConversionPattern<cggi::AndOp> {
-  ConvertBoolAndOp(mlir::MLIRContext *context)
-      : OpConversionPattern<cggi::AndOp>(context) {}
-
-  using OpConversionPattern::OpConversionPattern;
-
-  LogicalResult matchAndRewrite(
-      cggi::AndOp op, OpAdaptor adaptor,
-      ConversionPatternRewriter &rewriter) const override {
-    ImplicitLocOpBuilder b(op->getLoc(), rewriter);
-    FailureOr<Value> result = getContextualBoolServerKey(op);
-    if (failed(result)) return result;
-
-    Value serverKey = result.value();
-
-    rewriter.replaceOp(op, b.create<tfhe_rust_bool::AndOp>(
-                               serverKey, adaptor.getLhs(), adaptor.getRhs()));
-    return success();
-  }
-};
-
-struct ConvertBoolOrOp : public OpConversionPattern<cggi::OrOp> {
-  ConvertBoolOrOp(mlir::MLIRContext *context)
-      : OpConversionPattern<cggi::OrOp>(context) {}
-
-  using OpConversionPattern::OpConversionPattern;
+template <typename BinOp, typename TfheRustBoolBinOp>
+struct ConvertBinOp : public OpConversionPattern<BinOp> {
+  using OpConversionPattern<BinOp>::OpConversionPattern;
 
   LogicalResult matchAndRewrite(
-      cggi::OrOp op, OpAdaptor adaptor,
+      BinOp op, typename BinOp::Adaptor adaptor,
       ConversionPatternRewriter &rewriter) const override {
     ImplicitLocOpBuilder b(op->getLoc(), rewriter);
     FailureOr<Value> result = getContextualBoolServerKey(op);
@@ -167,32 +144,15 @@ struct ConvertBoolOrOp : public OpConversionPattern<cggi::OrOp> {
 
     Value serverKey = result.value();
 
-    rewriter.replaceOp(op, b.create<tfhe_rust_bool::OrOp>(
+    rewriter.replaceOp(op, b.create<TfheRustBoolBinOp>(
                                serverKey, adaptor.getLhs(), adaptor.getRhs()));
     return success();
   }
 };
 
-struct ConvertBoolXorOp : public OpConversionPattern<cggi::XorOp> {
-  ConvertBoolXorOp(mlir::MLIRContext *context)
-      : OpConversionPattern<cggi::XorOp>(context) {}
-
-  using OpConversionPattern::OpConversionPattern;
-
-  LogicalResult matchAndRewrite(
-      cggi::XorOp op, OpAdaptor adaptor,
-      ConversionPatternRewriter &rewriter) const override {
-    ImplicitLocOpBuilder b(op->getLoc(), rewriter);
-    FailureOr<Value> result = getContextualBoolServerKey(op);
-    if (failed(result)) return result;
-
-    Value serverKey = result.value();
-
-    rewriter.replaceOp(op, b.create<tfhe_rust_bool::XorOp>(
-                               serverKey, adaptor.getLhs(), adaptor.getRhs()));
-    return success();
-  }
-};
+using ConvertBoolAndOp = ConvertBinOp<cggi::AndOp, tfhe_rust_bool::AndOp>;
+using ConvertBoolOrOp = ConvertBinOp<cggi::OrOp, tfhe_rust_bool::OrOp>;
+using ConvertBoolXorOp = ConvertBinOp<cggi::XorOp, tfhe_rust_bool::XorOp>;
 
 struct ConvertBoolNotOp : public OpConversionPattern<cggi::NotOp> {
   ConvertBoolNotOp(mlir::MLIRContext *context)
@@ -218,7 +178,7 @@ struct ConvertBoolNotOp : public OpConversionPattern<cggi::NotOp> {
 struct ConvertBoolTrivialEncryptOp
     : public OpConversionPattern<lwe::TrivialEncryptOp> {
   ConvertBoolTrivialEncryptOp(mlir::MLIRContext *context)
-      : OpConversionPattern<lwe::TrivialEncryptOp>(context, /*benefit=*/2) {}
+      : OpConversionPattern<lwe::TrivialEncryptOp>(context, /*benefit=*/1) {}
 
   using OpConversionPattern::OpConversionPattern;
 
@@ -236,7 +196,7 @@ struct ConvertBoolTrivialEncryptOp
                             << op.getInput().getDefiningOp()->getName();
     }
     auto outputType = tfhe_rust_bool::EncryptedBoolType::get(getContext());
-    ;
+
     auto createTrivialOp = rewriter.create<tfhe_rust_bool::CreateTrivialOp>(
         op.getLoc(), outputType, serverKey, encodeOp.getPlaintext());
     rewriter.replaceOp(op, createTrivialOp);
@@ -264,7 +224,7 @@ class CGGIToTfheRustBool
     MLIRContext *context = &getContext();
     auto *op = getOperation();
 
-    BoolPassTypeConverter typeConverter(context);
+    CGGIToTfheRustBoolTypeConverter typeConverter(context);
     RewritePatternSet patterns(context);
     ConversionTarget target(*context);
     addStructuralConversionPatterns(typeConverter, patterns, target);
@@ -307,7 +267,7 @@ class CGGIToTfheRustBool
         GenericOpPattern<memref::LoadOp>, GenericOpPattern<memref::SubViewOp>,
         GenericOpPattern<memref::CopyOp>,
         GenericOpPattern<tensor::FromElementsOp>,
-        GenericOpPattern<tensor::ExtractOp>>(typeConverter, context);
+        GenericOpPattern<tensor::ExtractOp> >(typeConverter, context);
 
     if (failed(applyPartialConversion(op, target, std::move(patterns)))) {
       return signalPassFailure();
diff --git a/tests/tfhe_rust_bool/ops.mlir b/tests/tfhe_rust_bool/ops.mlir
index e97d705f7..1eb7f7353 100644
--- a/tests/tfhe_rust_bool/ops.mlir
+++ b/tests/tfhe_rust_bool/ops.mlir
@@ -29,21 +29,6 @@ module {
 
   // CHECK-LABEL: func @test_packed_and
   func.func @test_packed_and(%bsks : !bsks, %lhs : tensor<4x!eb>, %rhs : tensor<4x!eb>) {
-    %0 = arith.constant 0 : index
-    %1 = arith.constant 1 : index
-    %4 = arith.constant 4 : index
-
-    %c0 = arith.constant 0 : i1
-    %c1 = arith.constant 1 : i1
-
-    scf.for %i = %0 to %4 step %1 {
-      %tmp1 = tfhe_rust_bool.create_trivial %bsks, %c0 : (!bsks, i1) -> !eb
-      %tmp2 = tfhe_rust_bool.create_trivial %bsks, %c1 : (!bsks, i1) -> !eb
-
-      tensor.insert %tmp1 into %lhs[%i] : tensor<4x!eb>
-      tensor.insert %tmp2 into %rhs[%i] : tensor<4x!eb>
-    }
-
     %out = tfhe_rust_bool.and_packed %bsks, %lhs, %rhs: (!bsks, tensor<4x!eb>, tensor<4x!eb>) -> tensor<4x!eb>
     return
   }