diff --git a/ql/extractor/src/trap.rs b/ql/extractor/src/trap.rs
index 35a9b69f255..d64c520c4cc 100644
--- a/ql/extractor/src/trap.rs
+++ b/ql/extractor/src/trap.rs
@@ -61,15 +61,12 @@ impl Writer {
 
     pub fn write_to_file(&self, path: &Path, compression: Compression) -> std::io::Result<()> {
         let trap_file = std::fs::File::create(path)?;
+        let mut trap_file = BufWriter::new(trap_file);
         match compression {
-            Compression::None => {
-                let mut trap_file = BufWriter::new(trap_file);
-                self.write_trap_entries(&mut trap_file)
-            }
+            Compression::None => self.write_trap_entries(&mut trap_file),
             Compression::Gzip => {
-                let trap_file = GzEncoder::new(trap_file, flate2::Compression::fast());
-                let mut trap_file = BufWriter::new(trap_file);
-                self.write_trap_entries(&mut trap_file)
+                let mut compressed_writer = GzEncoder::new(trap_file, flate2::Compression::fast());
+                self.write_trap_entries(&mut compressed_writer)
             }
         }
     }
diff --git a/ruby/extractor/src/trap.rs b/ruby/extractor/src/trap.rs
index 35a9b69f255..d64c520c4cc 100644
--- a/ruby/extractor/src/trap.rs
+++ b/ruby/extractor/src/trap.rs
@@ -61,15 +61,12 @@ impl Writer {
 
     pub fn write_to_file(&self, path: &Path, compression: Compression) -> std::io::Result<()> {
         let trap_file = std::fs::File::create(path)?;
+        let mut trap_file = BufWriter::new(trap_file);
         match compression {
-            Compression::None => {
-                let mut trap_file = BufWriter::new(trap_file);
-                self.write_trap_entries(&mut trap_file)
-            }
+            Compression::None => self.write_trap_entries(&mut trap_file),
             Compression::Gzip => {
-                let trap_file = GzEncoder::new(trap_file, flate2::Compression::fast());
-                let mut trap_file = BufWriter::new(trap_file);
-                self.write_trap_entries(&mut trap_file)
+                let mut compressed_writer = GzEncoder::new(trap_file, flate2::Compression::fast());
+                self.write_trap_entries(&mut compressed_writer)
             }
         }
     }