From a11915db121a558ec12365dbc766621b6aa456b8 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Tue, 4 Jul 2017 12:21:46 +0900
Subject: [PATCH] minor cleanup

---
 Sources/Where.swift | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/Sources/Where.swift b/Sources/Where.swift
index 06aff22..bee5b6e 100644
--- a/Sources/Where.swift
+++ b/Sources/Where.swift
@@ -50,13 +50,11 @@ public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
      */
     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: FetchClause, QueryClause, DeleteClause, Hashable {
      */
     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: FetchClause, QueryClause, DeleteClause, Hashable {
      */
     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: FetchClause, QueryClause, DeleteClause, Hashable {
      */
     public static func || (left: Where?, right: Where) -> Where {
         
-        if left != nil {
+        if let left = left {
+            
             return left || right
         }
-        else {
-            
-            return right
-        }
+        return right
     }
     
     /**