diff --git a/Sources/Where.swift b/Sources/Where.swift
index 1daad7e..5cd0294 100644
--- a/Sources/Where.swift
+++ b/Sources/Where.swift
@@ -50,13 +50,11 @@ public struct Where<D: DynamicObject>: WhereClause, FetchClause, QueryClause, De
      */
     public static func && (left: Where, right: Where?) -> Where {
         
-        if right != nil {
-            return left && right!
-        }
-        else {
+        if let right = right {
             
-            return left
+            return left && right
         }
+        return left
     }
     
     /**
@@ -67,13 +65,11 @@ public struct Where<D: DynamicObject>: WhereClause, FetchClause, QueryClause, De
      */
     public static func && (left: Where?, right: Where) -> Where {
         
-        if left != nil {
+        if let left = left {
+            
             return left && right
         }
-        else {
-            
-            return right
-        }
+        return right
     }
     
     /**
@@ -92,13 +88,11 @@ public struct Where<D: DynamicObject>: WhereClause, FetchClause, QueryClause, De
      */
     public static func || (left: Where, right: Where?) -> Where {
         
-        if right != nil {
-            return left || right!
-        }
-        else {
+        if let right = right {
             
-            return left
+            return left || right
         }
+        return left
     }
     
     /**
@@ -109,13 +103,11 @@ public struct Where<D: DynamicObject>: WhereClause, FetchClause, QueryClause, De
      */
     public static func || (left: Where?, right: Where) -> Where {
         
-        if left != nil {
+        if let left = left {
+            
             return left || right
         }
-        else {
-            
-            return right
-        }
+        return right
     }
     
     /**