diff --git a/src/commands/vault.rs b/src/commands/vault.rs
index f407474a4302fa2ad96d001b786fb87541a55cad..1b66a605d62df5f09ebc9f39937bf702480cae3f 100644
--- a/src/commands/vault.rs
+++ b/src/commands/vault.rs
@@ -572,7 +572,6 @@ pub async fn handle_command(data: Data, command: Subcommand) -> Result<(), GcliE
 				.borrow()
 				.account
 				.crypto_scheme
-				.clone()
 				.ok_or(GcliError::Logic(
 					"Base account without crypto_scheme".to_string(),
 				))?
diff --git a/src/keys.rs b/src/keys.rs
index 3431e40540e1293d283fad9a112c58f5f2fd41a3..1108a9677357ce5a8f7ece7b8daa033a0e546cb1 100644
--- a/src/keys.rs
+++ b/src/keys.rs
@@ -148,18 +148,14 @@ pub fn get_keypair(
 	crypto_scheme: CryptoScheme,
 ) -> Result<KeyPair, GcliError> {
 	match (secret_format, secret) {
-		(SecretFormat::Predefined, Some(deriv)) => {
-			match crypto_scheme {
-				CryptoScheme::Ed25519 => {
-					pair_from_ed25519_str(&predefined_suri(deriv)).map(|v| v.into())
-				}
-				_ => pair_from_predefined(deriv).map(|v| v.into()),
+		(SecretFormat::Predefined, Some(deriv)) => match crypto_scheme {
+			CryptoScheme::Ed25519 => {
+				pair_from_ed25519_str(&predefined_suri(deriv)).map(|v| v.into())
 			}
-		}
+			_ => pair_from_predefined(deriv).map(|v| v.into()),
+		},
 		(secret_format, None) => Ok(prompt_secret(secret_format, Some(crypto_scheme))),
-		(_, Some(secret)) => {
-			pair_from_secret_with_scheme(secret_format, secret, crypto_scheme)
-		}
+		(_, Some(secret)) => pair_from_secret_with_scheme(secret_format, secret, crypto_scheme),
 	}
 }