diff --git a/src/client/cmd/add.rs b/src/client/cmd/add.rs
index c118c9cb229c4d12c9f5e70760a828401082b961..e495d8473f24b93a0b4d4a52e2370255cd4f8654 100644
--- a/src/client/cmd/add.rs
+++ b/src/client/cmd/add.rs
@@ -101,7 +101,7 @@ pub struct CommandAddHandler {
     sign_type: SignType,
     token: Option<String>,
     rpm_v3: bool,
-    sign_options: Option<HashMap<String, String>>
+    sign_options: Option<HashMap<String, String>>,
 }
 
 impl CommandAddHandler {
@@ -239,7 +239,9 @@ impl SignCommand for CommandAddHandler {
 
     fn validate(&mut self) -> Result<()> {
         let mut options = self.get_sign_options();
-        FileHandlerFactory::get_handler(&self.file_type).validate_options(&mut options).expect("failed to validate add signature command options");
+        FileHandlerFactory::get_handler(&self.file_type)
+            .validate_options(&mut options)
+            .expect("failed to validate add signature command options");
         self.sign_options = Some(options);
         Ok(())
     }
diff --git a/src/client/file_handler/efi.rs b/src/client/file_handler/efi.rs
index 4a059f801159945ba543ace52a14c7b02cef99b3..51c0bccd0a29672479c3d0ca1f4bb792dfc8669e 100644
--- a/src/client/file_handler/efi.rs
+++ b/src/client/file_handler/efi.rs
@@ -107,7 +107,7 @@ mod test {
         let mut options = HashMap::new();
         options.insert(options::DETACHED.to_string(), "true".to_string());
         let handler: EfiFileHandler = EfiFileHandler::new();
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
@@ -122,13 +122,13 @@ mod test {
             options::SIGN_TYPE.to_string(),
             SignType::Authenticode.to_string(),
         );
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_ok());
 
         *options
             .get_mut(options::KEY_TYPE.to_string().as_str())
             .unwrap() = KeyType::Pgp.to_string();
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
@@ -142,7 +142,7 @@ mod test {
         *options
             .get_mut(options::SIGN_TYPE.to_string().as_str())
             .unwrap() = SignType::PKCS7.to_string();
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
diff --git a/src/client/file_handler/generic.rs b/src/client/file_handler/generic.rs
index 2c8ca8d00054c98727db62c493d5a9e94e25b4fe..2101506d87611a38753c72e4a4820f95c84f12dc 100644
--- a/src/client/file_handler/generic.rs
+++ b/src/client/file_handler/generic.rs
@@ -89,7 +89,7 @@ mod test {
         let mut options = HashMap::new();
         options.insert(options::DETACHED.to_string(), "false".to_string());
         let handler = GenericFileHandler::new();
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
@@ -97,16 +97,16 @@ mod test {
         );
 
         options.remove(options::DETACHED);
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_ok());
 
         options.insert(options::DETACHED.to_string(), "true".to_string());
         options.insert(options::KEY_TYPE.to_string(), KeyType::Pgp.to_string());
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_ok());
 
         options.insert(options::KEY_TYPE.to_string(), KeyType::X509EE.to_string());
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
diff --git a/src/client/file_handler/kernel_module.rs b/src/client/file_handler/kernel_module.rs
index f0a7b9de05a304ff7970e4b98f69afd016cd6181..e11896adc57ce2e538b8e3a502551fd7b46e881e 100644
--- a/src/client/file_handler/kernel_module.rs
+++ b/src/client/file_handler/kernel_module.rs
@@ -175,7 +175,10 @@ impl FileHandler for KernelModuleFileHandler {
                 ));
             }
         }
-        sign_options.insert(options::INCLUDE_PARENT_CERT.to_string(), "false".to_string());
+        sign_options.insert(
+            options::INCLUDE_PARENT_CERT.to_string(),
+            "false".to_string(),
+        );
         Ok(())
     }
 
@@ -321,7 +324,7 @@ mod test {
         let mut options = HashMap::new();
         options.insert(options::KEY_TYPE.to_string(), KeyType::Pgp.to_string());
         let handler = KernelModuleFileHandler::new();
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
@@ -333,7 +336,7 @@ mod test {
             options::SIGN_TYPE.to_string(),
             SignType::Authenticode.to_string(),
         );
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
@@ -341,11 +344,11 @@ mod test {
         );
 
         options.insert(options::SIGN_TYPE.to_string(), SignType::Cms.to_string());
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_ok());
 
         options.insert(options::SIGN_TYPE.to_string(), SignType::PKCS7.to_string());
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_ok());
     }
 
diff --git a/src/client/file_handler/rpm.rs b/src/client/file_handler/rpm.rs
index 737962c8e9252653c947ae4cd7c45eedac5fd875..950a17c2e12d7dc5bba81a97cbe7d847b7747323 100644
--- a/src/client/file_handler/rpm.rs
+++ b/src/client/file_handler/rpm.rs
@@ -77,7 +77,7 @@ impl RpmFileHandler {
 //todo: figure our why is much slower when async read & write with tokio is enabled.
 #[async_trait]
 impl FileHandler for RpmFileHandler {
-    fn validate_options(&self, sign_options:&mut HashMap<String, String>) -> Result<()> {
+    fn validate_options(&self, sign_options: &mut HashMap<String, String>) -> Result<()> {
         if let Some(detached) = sign_options.get(options::DETACHED) {
             if detached == "true" {
                 return Err(Error::InvalidArgumentError(
@@ -240,7 +240,7 @@ mod test {
         let mut options = HashMap::new();
         options.insert(options::KEY_TYPE.to_string(), KeyType::X509EE.to_string());
         let handler = RpmFileHandler::new();
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
@@ -249,7 +249,7 @@ mod test {
 
         options.insert(options::KEY_TYPE.to_string(), KeyType::Pgp.to_string());
         options.insert(options::DETACHED.to_string(), "true".to_string());
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
@@ -257,7 +257,7 @@ mod test {
         );
 
         options.insert(options::DETACHED.to_string(), "false".to_string());
-        let result = handler.validate_options(&options);
+        let result = handler.validate_options(&mut options);
         assert!(result.is_ok());
     }
 
diff --git a/src/control_admin_entrypoint.rs b/src/control_admin_entrypoint.rs
index 2fbdfea8c74f6de402f590d4f9332c7b542af3bb..250c28cd0be10705617ec9887baf9172d8ce92d3 100644
--- a/src/control_admin_entrypoint.rs
+++ b/src/control_admin_entrypoint.rs
@@ -175,10 +175,7 @@ fn generate_keys_parameters(command: &CommandGenerateKeys) -> HashMap<String, St
             "organizational_unit".to_string(),
             command.param_x509_organizational_unit.clone().unwrap(),
         );
-        attributes.insert(
-            "x509_ee_usage".to_string(),
-            "efi".to_string(),
-        );
+        attributes.insert("x509_ee_usage".to_string(), "efi".to_string());
     }
     attributes
 }
diff --git a/src/infra/sign_plugin/x509.rs b/src/infra/sign_plugin/x509.rs
index 776034f19b7d301783e29a1903695afa6a2acec0..926c1c830190a1cd4f720c1bb8d226f356c22f8e 100644
--- a/src/infra/sign_plugin/x509.rs
+++ b/src/infra/sign_plugin/x509.rs
@@ -562,7 +562,12 @@ impl SignPlugins for X509Plugin {
         let certificate = x509::X509::from_pem(self.certificate.unsecure())?;
         let mut cert_stack = Stack::new()?;
         cert_stack.push(certificate.clone())?;
-        if options.get(options::INCLUDE_PARENT_CERT).unwrap_or(&"true".to_string()) == "true" && self.parent_key.is_some() {
+        if options
+            .get(options::INCLUDE_PARENT_CERT)
+            .unwrap_or(&"true".to_string())
+            == "true"
+            && self.parent_key.is_some()
+        {
             cert_stack.push(x509::X509::from_pem(
                 self.parent_key.clone().unwrap().certificate.unsecure(),
             )?)?;
@@ -574,7 +579,12 @@ impl SignPlugins for X509Plugin {
         )? {
             SignType::Authenticode => {
                 let mut bufs: Vec<Vec<u8>> = vec![];
-                if options.get(options::INCLUDE_PARENT_CERT).unwrap_or(&"true".to_string()) == "true" && self.parent_key.is_some() {
+                if options
+                    .get(options::INCLUDE_PARENT_CERT)
+                    .unwrap_or(&"true".to_string())
+                    == "true"
+                    && self.parent_key.is_some()
+                {
                     bufs.push(
                         self.parent_key
                             .clone()
diff --git a/src/util/options.rs b/src/util/options.rs
index d17efece06adb132992b344df75eaa89fb652ca0..beff556b5bdd3e431209f1c73319a210976bfe4a 100644
--- a/src/util/options.rs
+++ b/src/util/options.rs
@@ -18,4 +18,4 @@ pub const DETACHED: &str = "detached";
 pub const KEY_TYPE: &str = "key_type";
 pub const SIGN_TYPE: &str = "sign_type";
 pub const RPM_V3_SIGNATURE: &str = "rpm_signature_type";
-pub const INCLUDE_PARENT_CERT: &str = "include_parent_cert";
\ No newline at end of file
+pub const INCLUDE_PARENT_CERT: &str = "include_parent_cert";