diff --git a/lib/wafris/middleware.rb b/lib/wafris/middleware.rb
index 6e8d004..61a78d3 100644
--- a/lib/wafris/middleware.rb
+++ b/lib/wafris/middleware.rb
@@ -9,12 +9,13 @@ def initialize(app)
     end
 
     def call(env)
-      request = Rack::Request.new(env)
-
-      treatment = Wafris.evaluate(
-        WafrisRequest.new(request, env)
+      wafris_request = WafrisRequest.new(
+        Rack::Request.new(env),
+        env
       )
 
+      treatment = Wafris.evaluate(wafris_request)
+
       @notifier&.instrument("#{treatment}.wafris", request: wafris_request, treatment: treatment)
 
       # These values match what the client tests expect (200, 404, 403, 500)