diff --git a/pom.xml b/pom.xml
index 4a7fc2b3f5..12d22072cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1423,6 +1423,9 @@
             <name>MatrixNeoKozak</name>
             <email>matrixneo2026@tutamail.com</email>
         </contributor>
+        <contributor>
+            <name>Ashutosh Panda</name>
+        </contributor>
     </contributors>
     <dependencies>
         <!-- this includes httpclient as dependency -->
diff --git a/src/main/java/org/htmlunit/WebClient.java b/src/main/java/org/htmlunit/WebClient.java
index bb221c7b1b..a9e3de3f18 100644
--- a/src/main/java/org/htmlunit/WebClient.java
+++ b/src/main/java/org/htmlunit/WebClient.java
@@ -152,6 +152,7 @@
  * @author Lai Quang Duong
  * @author René Schwietzke
  * @author Sven Strickroth
+ * @author Ashutosh Panda
  */
 @SuppressWarnings("PMD.TooManyFields")
 public class WebClient implements Serializable, AutoCloseable {
@@ -2710,11 +2711,7 @@ public boolean isOutdated() {
                 return true;
             }
 
-            if (requestingWindow_.getEnclosedPage() != originalPage_.get()) {
-                return true;
-            }
-
-            return false;
+            return requestingWindow_.getEnclosedPage() != originalPage_.get();
         }
     }
 
diff --git a/src/main/java/org/htmlunit/css/CssStyleSheet.java b/src/main/java/org/htmlunit/css/CssStyleSheet.java
index bc55845ee0..fe231b6108 100644
--- a/src/main/java/org/htmlunit/css/CssStyleSheet.java
+++ b/src/main/java/org/htmlunit/css/CssStyleSheet.java
@@ -116,6 +116,7 @@
  * @author Frank Danek
  * @author Carsten Steul
  * @author Sven Strickroth
+ * @author Ashutosh Panda
  */
 public class CssStyleSheet implements Serializable {
 
@@ -538,11 +539,8 @@ && selects(browserVersion, domElement, gas.getSelector(),
 
                     case NEXT_SIBLING_COMBINATOR:
                         final DomElement nextSibling = element.getNextElementSibling();
-                        if (nextSibling != null && selects(browserVersion, nextSibling, rs.getSelector(), pseudoElement,
-                                                            scope, fromQuerySelectorAll, throwOnSyntax)) {
-                            return true;
-                        }
-                        return false;
+                        return nextSibling != null && selects(browserVersion, nextSibling, rs.getSelector(), pseudoElement,
+                                                                scope, fromQuerySelectorAll, throwOnSyntax);
 
                     case SUBSEQUENT_SIBLING_COMBINATOR:
                         for (DomNode n = element.getNextSibling(); n != null; n = n.getNextSibling()) {
diff --git a/src/main/java/org/htmlunit/html/impl/Color.java b/src/main/java/org/htmlunit/html/impl/Color.java
index 00af66fb7c..91795ec1ba 100644
--- a/src/main/java/org/htmlunit/html/impl/Color.java
+++ b/src/main/java/org/htmlunit/html/impl/Color.java
@@ -21,6 +21,7 @@
  * independent of awt (for this).
  *
  * @author Ronald Brill
+ * @author Ashutosh Panda
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public class Color {
@@ -137,9 +138,6 @@ public boolean equals(final Object obj) {
         if (green_ != other.green_) {
             return false;
         }
-        if (red_ != other.red_) {
-            return false;
-        }
-        return true;
+        return red_ == other.red_;
     }
 }
diff --git a/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java b/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java
index 13890ed446..6f18e76612 100644
--- a/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java
+++ b/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java
@@ -111,6 +111,7 @@
  * @author Thorsten Wendelmuth
  * @author Lai Quang Duong
  * @author Sven Strickroth
+ * @author Ashutosh Panda
  *
  * @see <a href="https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest">MDN Documentation</a>
  */
@@ -1231,15 +1232,12 @@ private static boolean isPreflightHeader(final String name, final String value)
                     && !lcValue.startsWith(FormEncodingType.MULTIPART.getName())
                     && !lcValue.startsWith(FormEncodingType.TEXT_PLAIN.getName());
         }
-        if (HttpHeader.ACCEPT_LC.equals(name)
+        return !(HttpHeader.ACCEPT_LC.equals(name)
                 || HttpHeader.ACCEPT_LANGUAGE_LC.equals(name)
                 || HttpHeader.CONTENT_LANGUAGE_LC.equals(name)
                 || HttpHeader.REFERER_LC.equals(name)
                 || "accept-encoding".equals(name)
-                || HttpHeader.ORIGIN_LC.equals(name)) {
-            return false;
-        }
-        return true;
+                || HttpHeader.ORIGIN_LC.equals(name));
     }
 
     /**
@@ -1282,10 +1280,7 @@ static boolean isAuthorizedHeader(final String name) {
         if (PROHIBITED_HEADERS_.contains(nameLowerCase)) {
             return false;
         }
-        if (nameLowerCase.startsWith("proxy-") || nameLowerCase.startsWith("sec-")) {
-            return false;
-        }
-        return true;
+        return !nameLowerCase.startsWith("proxy-") && !nameLowerCase.startsWith("sec-");
     }
 
     /**
diff --git a/src/main/java/org/htmlunit/util/StringUtils.java b/src/main/java/org/htmlunit/util/StringUtils.java
index 3da0e842a1..f77b683121 100644
--- a/src/main/java/org/htmlunit/util/StringUtils.java
+++ b/src/main/java/org/htmlunit/util/StringUtils.java
@@ -35,6 +35,7 @@
  * @author Ahmed Ashour
  * @author Martin Tamme
  * @author Ronald Brill
+ * @author Ashutosh Panda
  */
 public final class StringUtils {
 
@@ -508,14 +509,7 @@ private static boolean supportedByXML10(final int codepoint) {
             return true;
         }
 
-        if (codepoint < 0x10000) {
-            return false;
-        }
-        if (codepoint <= 0x10FFFF) {
-            return true;
-        }
-
-        return true;
+        return codepoint >= 0x10000;
     }
 
     /**
diff --git a/src/main/java/org/htmlunit/util/geometry/Line2D.java b/src/main/java/org/htmlunit/util/geometry/Line2D.java
index 43d9cecbcd..c664fb6981 100644
--- a/src/main/java/org/htmlunit/util/geometry/Line2D.java
+++ b/src/main/java/org/htmlunit/util/geometry/Line2D.java
@@ -18,6 +18,7 @@
  * Simple 2D line segment shape.
  *
  * @author Ronald Brill
+ * @author Ashutosh Panda
  */
 public class Line2D implements Shape2D {
 
@@ -122,12 +123,8 @@ public boolean contains(final double x, final double y) {
             }
         }
 
-        if (y < startY_ && y < endY_
-                || (y > startY_ && y > endY_)) {
-            return false;
-        }
-
-        return true;
+        return !(y < startY_ && y < endY_
+                || (y > startY_ && y > endY_));
     }
 
     /**