diff --git a/src/main/java/net/kemitix/conditional/Condition.java b/src/main/java/net/kemitix/conditional/Condition.java
index 33c0a31..c87a74f 100644
--- a/src/main/java/net/kemitix/conditional/Condition.java
+++ b/src/main/java/net/kemitix/conditional/Condition.java
@@ -38,7 +38,10 @@ public interface Condition {
      * @return the Condition
      */
     static Condition where(final boolean clause) {
-        return clause ? TrueCondition.TRUE : FalseCondition.FALSE;
+        if (clause) {
+            return TrueCondition.TRUE;
+        }
+        return FalseCondition.FALSE;
     }
 
     /**
diff --git a/src/main/java/net/kemitix/conditional/FalseCondition.java b/src/main/java/net/kemitix/conditional/FalseCondition.java
index cd382ca..3ffdbd2 100644
--- a/src/main/java/net/kemitix/conditional/FalseCondition.java
+++ b/src/main/java/net/kemitix/conditional/FalseCondition.java
@@ -38,6 +38,7 @@ final class FalseCondition implements Condition {
     }
 
     @Override
+    @SuppressWarnings("PMD.ShortMethodName")
     public Condition or(final Supplier<Boolean> secondClause) {
         return Condition.where(secondClause.get());
     }
diff --git a/src/main/java/net/kemitix/conditional/FalseValueClause.java b/src/main/java/net/kemitix/conditional/FalseValueClause.java
index 94775f2..b609428 100644
--- a/src/main/java/net/kemitix/conditional/FalseValueClause.java
+++ b/src/main/java/net/kemitix/conditional/FalseValueClause.java
@@ -46,6 +46,7 @@ class FalseValueClause<T> implements Value.ValueClause<T> {
     }
 
     @Override
+    @SuppressWarnings("PMD.ShortMethodName")
     public Value.ValueClause<T> or(final Supplier<Boolean> clause) {
         return Value.where(clause.get());
     }
diff --git a/src/main/java/net/kemitix/conditional/TrueCondition.java b/src/main/java/net/kemitix/conditional/TrueCondition.java
index 987496c..0691433 100644
--- a/src/main/java/net/kemitix/conditional/TrueCondition.java
+++ b/src/main/java/net/kemitix/conditional/TrueCondition.java
@@ -38,6 +38,7 @@ final class TrueCondition implements Condition {
     }
 
     @Override
+    @SuppressWarnings("PMD.ShortMethodName")
     public Condition or(final Supplier<Boolean> secondClause) {
         return TRUE;
     }
diff --git a/src/main/java/net/kemitix/conditional/TrueValueClause.java b/src/main/java/net/kemitix/conditional/TrueValueClause.java
index c5c04ad..41707c3 100644
--- a/src/main/java/net/kemitix/conditional/TrueValueClause.java
+++ b/src/main/java/net/kemitix/conditional/TrueValueClause.java
@@ -48,6 +48,7 @@ class TrueValueClause<T> implements Value.ValueClause<T> {
     }
 
     @Override
+    @SuppressWarnings("PMD.ShortMethodName")
     public Value.ValueClause<T> or(final Supplier<Boolean> clause) {
         return this;
     }
@@ -60,6 +61,7 @@ class TrueValueClause<T> implements Value.ValueClause<T> {
     @RequiredArgsConstructor
     private static final class TrueValueSupplier<T> implements ValueSupplier<T> {
 
+        @SuppressWarnings("PMD.BeanMembersShouldSerialize")
         private final Supplier<T> valueSupplier;
 
         @Override
diff --git a/src/main/java/net/kemitix/conditional/Value.java b/src/main/java/net/kemitix/conditional/Value.java
index fe2b182..d41b481 100644
--- a/src/main/java/net/kemitix/conditional/Value.java
+++ b/src/main/java/net/kemitix/conditional/Value.java
@@ -41,6 +41,7 @@ public interface Value {
      *
      * @return the value from either the trueSupplier or the falseSupplier
      */
+    @SuppressWarnings("PMD.LawOfDemeter")
     static <T> T where(
             final boolean clause,
             final Supplier<T> trueSupplier,
@@ -75,7 +76,10 @@ public interface Value {
      * @return a true or false value clause
      */
     static <T> ValueClause<T> where(final boolean clause) {
-        return (ValueClause<T>) (clause ? TrueValueClause.TRUE : FalseValueClause.FALSE);
+        if (clause) {
+            return TrueValueClause.TRUE;
+        }
+        return FalseValueClause.FALSE;
     }
 
     /**