diff --git a/swordfish/src/katana.rs b/swordfish/src/katana.rs
index 7a8ea51..69b1dc7 100644
--- a/swordfish/src/katana.rs
+++ b/swordfish/src/katana.rs
@@ -257,14 +257,12 @@ pub async fn analyze_card_libtesseract(card: image::DynamicImage, count: u32) ->
         Some(c) => {
             card = c;
         }
-        None => {
-            match db::query_card_regex(&card.name, &card.series).await {
-                Some(c) => {
-                    card = c;
-                }
-                None => {}
+        None => match db::query_card_regex(&card.name, &card.series).await {
+            Some(c) => {
+                card = c;
             }
-        }
+            None => {}
+        },
     }
     card
 }
@@ -323,14 +321,12 @@ pub async fn analyze_card_subprocess(card: image::DynamicImage, count: u32) -> C
         Some(c) => {
             card = c;
         }
-        None => {
-            match db::query_card_regex(&card.name, &card.series).await {
-                Some(c) => {
-                    card = c;
-                }
-                None => {}
+        None => match db::query_card_regex(&card.name, &card.series).await {
+            Some(c) => {
+                card = c;
             }
-        }
+            None => {}
+        },
     }
     card
 }
diff --git a/swordfish/src/main.rs b/swordfish/src/main.rs
index 5971ba6..5257e76 100644
--- a/swordfish/src/main.rs
+++ b/swordfish/src/main.rs
@@ -123,7 +123,7 @@ async fn parse_katana_event(ctx: &Context, event: MessageUpdateEvent) -> Result<
 }
 
 async fn parse_katana(ctx: &Context, msg: &Message) -> Result<(), String> {
-    if msg.content.contains("is dropping 3 cards!")
+    if (msg.content.contains("is dropping") && msg.content.contains("cards!"))
         || msg
             .content
             .contains("I'm dropping 3 cards since this server is currently active!")