diff --git a/Cargo.lock b/Cargo.lock
index 89c11c2..7d2e786 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -719,9 +719,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d"
 dependencies = [
  "crossbeam-utils",
 ]
diff --git a/phantom-core/src/dom/query.rs b/phantom-core/src/dom/query.rs
index 7d488b6..d1c473a 100644
--- a/phantom-core/src/dom/query.rs
+++ b/phantom-core/src/dom/query.rs
@@ -176,10 +176,8 @@ impl<'a> selectors::Element for DomElement<'a> {
                     arena: self.arena,
                 });
             }
-            match node.previous_sibling() {
-                Some(prev) => curr = prev,
-                None => return None,
-            }
+            let prev = node.previous_sibling()?;
+            curr = prev;
         }
     }
 
@@ -193,10 +191,8 @@ impl<'a> selectors::Element for DomElement<'a> {
                     arena: self.arena,
                 });
             }
-            match node.next_sibling() {
-                Some(next) => curr = next,
-                None => return None,
-            }
+            let next = node.next_sibling()?;
+            curr = next;
         }
     }
 
diff --git a/phantom-mcp/src/bin/phantom.rs b/phantom-mcp/src/bin/phantom.rs
index 7970de0..acb4db5 100644
--- a/phantom-mcp/src/bin/phantom.rs
+++ b/phantom-mcp/src/bin/phantom.rs
@@ -37,10 +37,9 @@ async fn run_http() -> Result<(), Box<dyn std::error::Error>> {
     telemetry::init();
 
     let bind_addr = env::var("PHANTOM_BIND_ADDR").unwrap_or_else(|_| "0.0.0.0:8080".to_string());
-    let api_key =
-        env::var("PHANTOM_API_KEY")
-            .ok()
-            .and_then(|v| if v.trim().is_empty() { None } else { Some(v) });
+    let api_key = env::var("PHANTOM_API_KEY")
+        .ok()
+        .filter(|v| !v.trim().is_empty());
 
     let rate_limit = env::var("PHANTOM_RATE_LIMIT")
         .ok()