diff --git a/tools/packaging/kata-deploy/binary/src/artifacts/install.rs b/tools/packaging/kata-deploy/binary/src/artifacts/install.rs
index afdf81eec2..661cd14d58 100644
--- a/tools/packaging/kata-deploy/binary/src/artifacts/install.rs
+++ b/tools/packaging/kata-deploy/binary/src/artifacts/install.rs
@@ -341,10 +341,10 @@ fn copy_artifacts(src: &str, dst: &str) -> Result<()> {
                 if let Ok(rel) = link_target.strip_prefix(src_path) {
                     Path::new(dst).join(rel)
                 } else {
-                    link_target.into()
+                    link_target
                 }
             } else {
-                link_target.into()
+                link_target
             };
 
             if let Some(parent) = dst_path.parent() {
@@ -385,7 +385,7 @@ fn copy_artifacts(src: &str, dst: &str) -> Result<()> {
 }
 
 fn set_executable_permissions(dir: &str) -> Result<()> {
-    let bin_paths = vec!["bin", "runtime-rs/bin"];
+    let bin_paths = ["bin", "runtime-rs/bin"];
 
     for bin_path in bin_paths.iter() {
         let bin_dir = Path::new(dir).join(bin_path);
diff --git a/tools/packaging/kata-deploy/binary/src/main.rs b/tools/packaging/kata-deploy/binary/src/main.rs
index a30c5d3eff..d68797e9c6 100644
--- a/tools/packaging/kata-deploy/binary/src/main.rs
+++ b/tools/packaging/kata-deploy/binary/src/main.rs
@@ -177,36 +177,30 @@ async fn install(config: &config::Config, runtime: &str) -> Result<()> {
     }
 
     // Validate snapshotter if needed
-    match config.experimental_setup_snapshotter.as_ref() {
-        Some(snapshotter) => {
-            let non_empty_snapshotters: Vec<_> =
-                snapshotter.iter().filter(|s| !s.is_empty()).collect();
+    if let Some(snapshotter) = config.experimental_setup_snapshotter.as_ref() {
+        let non_empty_snapshotters: Vec<_> = snapshotter.iter().filter(|s| !s.is_empty()).collect();
 
-            if !non_empty_snapshotters.is_empty() {
-                if runtime == "crio" {
-                    log::warn!("EXPERIMENTAL_SETUP_SNAPSHOTTER is being ignored!");
-                    log::warn!("Snapshotter is a containerd specific option.");
-                } else {
-                    for s in &non_empty_snapshotters {
-                        match s.as_str() {
-                            "erofs" => {
-                                runtime::containerd::containerd_erofs_snapshotter_version_check(
-                                    config,
-                                )
+        if !non_empty_snapshotters.is_empty() {
+            if runtime == "crio" {
+                log::warn!("EXPERIMENTAL_SETUP_SNAPSHOTTER is being ignored!");
+                log::warn!("Snapshotter is a containerd specific option.");
+            } else {
+                for s in &non_empty_snapshotters {
+                    match s.as_str() {
+                        "erofs" => {
+                            runtime::containerd::containerd_erofs_snapshotter_version_check(config)
                                 .await?;
-                            }
-                            "nydus" => {}
-                            _ => {
-                                return Err(anyhow::anyhow!(
-                                    "{s} is not a supported snapshotter by kata-deploy"
-                                ));
-                            }
+                        }
+                        "nydus" => {}
+                        _ => {
+                            return Err(anyhow::anyhow!(
+                                "{s} is not a supported snapshotter by kata-deploy"
+                            ));
                         }
                     }
                 }
             }
         }
-        None => {}
     }
 
     runtime::containerd::setup_containerd_config_files(runtime, config).await?;
@@ -216,15 +210,12 @@ async fn install(config: &config::Config, runtime: &str) -> Result<()> {
     runtime::configure_cri_runtime(config, runtime).await?;
 
     if runtime != "crio" {
-        match config.experimental_setup_snapshotter.as_ref() {
-            Some(snapshotters) => {
-                for snapshotter in snapshotters {
-                    artifacts::snapshotters::install_snapshotter(snapshotter, config).await?;
-                    artifacts::snapshotters::configure_snapshotter(snapshotter, runtime, config)
-                        .await?;
-                }
+        if let Some(snapshotters) = config.experimental_setup_snapshotter.as_ref() {
+            for snapshotter in snapshotters {
+                artifacts::snapshotters::install_snapshotter(snapshotter, config).await?;
+                artifacts::snapshotters::configure_snapshotter(snapshotter, runtime, config)
+                    .await?;
             }
-            None => {}
         }
     }
 
diff --git a/tools/packaging/kata-deploy/binary/src/utils/toml.rs b/tools/packaging/kata-deploy/binary/src/utils/toml.rs
index 80c2fd75d9..7e1df11b9c 100644
--- a/tools/packaging/kata-deploy/binary/src/utils/toml.rs
+++ b/tools/packaging/kata-deploy/binary/src/utils/toml.rs
@@ -15,9 +15,9 @@ fn parse_toml_path(path: &str) -> Result<Vec<String>> {
     let mut parts = Vec::new();
     let mut current = String::new();
     let mut in_quotes = false;
-    let mut chars = path.chars().peekable();
+    let chars = path.chars().peekable();
 
-    while let Some(ch) = chars.next() {
+    for ch in chars {
         match ch {
             '"' => {
                 in_quotes = !in_quotes;
diff --git a/tools/packaging/kata-deploy/binary/src/utils/yaml.rs b/tools/packaging/kata-deploy/binary/src/utils/yaml.rs
index a34d0a4dfd..bfa5a3d39f 100644
--- a/tools/packaging/kata-deploy/binary/src/utils/yaml.rs
+++ b/tools/packaging/kata-deploy/binary/src/utils/yaml.rs
@@ -37,15 +37,14 @@ pub fn set_yaml_value(file_path: &Path, key_path: &str, value: serde_yaml::Value
         } else {
             // Navigate/create intermediate mappings
             if let Some(map) = current.as_mapping_mut() {
-                if !map.contains_key(&serde_yaml::Value::String(part.to_string())) {
+                let key = serde_yaml::Value::String(part.to_string());
+                if !map.contains_key(&key) {
                     map.insert(
-                        serde_yaml::Value::String(part.to_string()),
+                        key.clone(),
                         serde_yaml::Value::Mapping(serde_yaml::Mapping::new()),
                     );
                 }
-                current = map
-                    .get_mut(&serde_yaml::Value::String(part.to_string()))
-                    .unwrap();
+                current = map.get_mut(&key).unwrap();
             } else {
                 return Err(anyhow::anyhow!("Path component '{part}' is not a mapping"));
             }