diff --git a/src/util_envelop.rs b/src/util_envelop.rs
index 6086291..01bc98b 100644
--- a/src/util_envelop.rs
+++ b/src/util_envelop.rs
@@ -3,11 +3,9 @@ use crate::spec::TinyEncryptEnvelop;
 
 pub fn format_envelop(envelop: &TinyEncryptEnvelop, config: &Option<TinyEncryptConfig>) -> String {
     let config_envelop = config.as_ref().and_then(|c| c.find_by_kid(&envelop.kid));
-    let envelop_kid = config_envelop.and_then(|e| e.sid.as_ref()).map(|sid|
-        format!(", Sid: {}", sid)
-    ).unwrap_or_else(|| {
-        format!(", Kid: {}", envelop.kid)
-    });
+    let envelop_kid = config_envelop.and_then(|e| e.sid.as_ref())
+        .map(|sid| format!(", Sid: {}", sid))
+        .unwrap_or_else(|| format!(", Kid: {}", envelop.kid));
     let envelop_desc = get_envelop_desc(envelop, &config_envelop);
     let desc = envelop_desc.as_ref()
         .map(|desc| format!(", Desc: {}", desc))