diff --git a/blah-types/src/identity.rs b/blah-types/src/identity.rs
index f617a6d..836a39f 100644
--- a/blah-types/src/identity.rs
+++ b/blah-types/src/identity.rs
@@ -51,10 +51,10 @@ impl UserIdentityDesc {
 
     /// Validate signatures of the identity description at given time.
     pub fn verify(&self, id_url: Option<&IdUrl>, now_timestamp: u64) -> Result<(), VerifyError> {
-        if let Some(id_url) = id_url {
-            if !self.profile.signee.payload.id_urls.contains(id_url) {
-                return Err(VerifyErrorImpl::MissingIdUrl.into());
-            }
+        if let Some(id_url) = id_url
+            && !self.profile.signee.payload.id_urls.contains(id_url)
+        {
+            return Err(VerifyErrorImpl::MissingIdUrl.into());
         }
         if self.id_key != self.profile.signee.user.id_key {
             return Err(VerifyErrorImpl::ProfileIdKeyMismatch.into());
diff --git a/blahd/src/event.rs b/blahd/src/event.rs
index 5366e92..595e3ac 100644
--- a/blahd/src/event.rs
+++ b/blahd/src/event.rs
@@ -63,10 +63,10 @@ impl State {
         let mut cnt = 0usize;
         let msg = Arc::new(ServerEvent::Msg(msg));
         for uid in &room_members {
-            if let Some(tx) = listeners.get(uid) {
-                if tx.send(msg.clone()).is_ok() {
-                    cnt += 1;
-                }
+            if let Some(tx) = listeners.get(uid)
+                && tx.send(msg.clone()).is_ok()
+            {
+                cnt += 1;
             }
         }
         if cnt != 0 {
@@ -119,10 +119,10 @@ impl Drop for UserEventReceiver {
     fn drop(&mut self) {
         tracing::debug!(%self.uid, "user disconnected");
         let mut map = self.st.event.user_listeners.lock();
-        if let Some(tx) = map.get_mut(&self.uid) {
-            if tx.receiver_count() == 1 {
-                map.remove(&self.uid);
-            }
+        if let Some(tx) = map.get_mut(&self.uid)
+            && tx.receiver_count() == 1
+        {
+            map.remove(&self.uid);
         }
     }
 }