diff --git a/src/cli.rs b/src/cli.rs
index 578e96e..bd1445f 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -182,7 +182,7 @@ async fn send_kms_request_with_ssh_enabled(ssh_remote: &Option<String>, get_requ
             }
             if let Some(body) = body {
                 c.args(["-H", "x-body-based64-encoded:1"]);
-                c.args(["--data-raw", &format!("{}", STANDARD.encode(&body))]);
+                c.args(["--data-raw", &STANDARD.encode(body).to_string()]);
             }
             c.arg(uri);
             debugging!("Run command: {:?}", c);
@@ -193,10 +193,8 @@ async fn send_kms_request_with_ssh_enabled(ssh_remote: &Option<String>, get_requ
             debugging!("Output: {:?}", output);
             let data: Value = serde_json::from_slice(&output.stdout)?;
             if let Value::Object(data_map) = &data {
-                if let Some(error)  = data_map.get("error") {
-                    if let Value::String(error) = error {
-                        return simple_error!("Get error: {}, details: {}", error, data);
-                    }
+                if let Some(Value::String(error))  = data_map.get("error") {
+                    return simple_error!("Get error: {}, details: {}", error, data);
                 }
             }
             Ok(data)
@@ -297,7 +295,7 @@ fn master_key_encrypt(master_key: &str, jwk: &str) -> XResult<String> {
             let challenge = opt_result!(
                 pinentry_util::read_pin(Some("Input yubikey challenge"), Some("Challenge: ")), "Read challenge failed: {}");
             let derived_key = yubikey_hmac::yubikey_challenge_as_32_bytes(challenge.get_pin().as_bytes())?;
-            let (key, _) = jose::deserialize_jwe_aes(&master_key, &derived_key)?;
+            let (key, _) = jose::deserialize_jwe_aes(master_key, &derived_key)?;
             key
         }
         #[cfg(not(feature = "yubikey"))]
@@ -305,7 +303,7 @@ fn master_key_encrypt(master_key: &str, jwk: &str) -> XResult<String> {
     } else {
         master_key.as_bytes().to_vec()
     };
-    let rsa_public_key = jwk_to_rsa_pubic_key(&jwk)?;
+    let rsa_public_key = jwk_to_rsa_pubic_key(jwk)?;
     let encrypted_master_key = jose::serialize_jwe_rsa(&master_key, &rsa_public_key)?;
     Ok(encrypted_master_key)
 }