diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ConnectExceptionSupport.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ConnectExceptionSupport.java
index 49ab3972a3..b7b72d80c0 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ConnectExceptionSupport.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ConnectExceptionSupport.java
@@ -74,11 +74,10 @@ public static IOException enhance(
                 final IOException ex = createConnectTimeoutException(cause, namedEndpoint, remoteAddresses);
                 ex.initCause(cause);
                 return ex;
-            } else {
-                final IOException ex = createHttpHostConnectException(cause, namedEndpoint, remoteAddresses);
-                ex.setStackTrace(cause.getStackTrace());
-                return ex;
             }
+            final IOException ex = createHttpHostConnectException(cause, namedEndpoint, remoteAddresses);
+            ex.setStackTrace(cause.getStackTrace());
+            return ex;
         } else {
             return cause;
         }
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/HttpRoute.java b/httpclient5/src/main/java/org/apache/hc/client5/http/HttpRoute.java
index ce3a6be55a..6651640819 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/HttpRoute.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/HttpRoute.java
@@ -213,9 +213,8 @@ public final HttpHost getHopTarget(final int hop) {
         Args.check(hop < hopcount, "Hop index exceeds tracked route length");
         if (hop < hopcount - 1) {
             return this.proxyChain.get(hop);
-        } else {
-            return this.targetHost;
         }
+        return this.targetHost;
     }
 
     @Override
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java
index 5b1018836e..38f51cd212 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java
@@ -67,8 +67,7 @@ public DecompressingEntity(
     }
 
     private InputStream getDecompressingStream() throws IOException {
-        final InputStream in = super.getContent();
-        return new LazyDecompressingInputStream(in, inputStreamFactory);
+        return new LazyDecompressingInputStream(super.getContent(), inputStreamFactory);
     }
 
     @Override
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java
index 9f3e9261b9..5edb67ce4f 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java
@@ -51,6 +51,7 @@ public String getName() {
         return this.name;
     }
 
+    @Override
     public void addField(final String name, final String value) {
         Args.notNull(name, "Field name");
         super.addField(name, value);
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java
index 5471476481..3ee5e070c7 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java
@@ -77,9 +77,8 @@ public final HttpRoute determineRoute(final HttpHost host, final HttpContext con
         final boolean secure = target.getSchemeName().equalsIgnoreCase("https");
         if (proxy == null) {
             return new HttpRoute(target, determineLocalAddress(target, context), secure);
-        } else {
-            return new HttpRoute(target, determineLocalAddress(proxy, context), proxy, secure);
         }
+        return new HttpRoute(target, determineLocalAddress(proxy, context), proxy, secure);
     }
 
     /**
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java
index bb1fdcd735..628ee78d95 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java
@@ -106,9 +106,8 @@ private static boolean hasEntry(final Map<String, DomainType> map, final String
         final DomainType domainType = map.get(rule);
         if (domainType == null) {
             return false;
-        } else {
-            return expectedType == null || domainType.equals(expectedType);
         }
+        return expectedType == null || domainType.equals(expectedType);
     }
 
     private boolean hasRule(final String rule, final DomainType expectedType) {
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/routing/RoutingSupport.java b/httpclient5/src/main/java/org/apache/hc/client5/http/routing/RoutingSupport.java
index 965a8c713f..4205a19230 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/routing/RoutingSupport.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/routing/RoutingSupport.java
@@ -51,18 +51,17 @@ public static HttpHost determineHost(final HttpRequest request) throws HttpExcep
                 throw new ProtocolException("Protocol scheme is not specified");
             }
             return new HttpHost(scheme, authority);
-        } else {
-            try {
-                final URI requestURI = request.getUri();
-                if (requestURI.isAbsolute()) {
-                    final HttpHost httpHost = URIUtils.extractHost(requestURI);
-                    if (httpHost == null) {
-                        throw new ProtocolException("URI does not specify a valid host name: " + requestURI);
-                    }
-                    return httpHost;
+        }
+        try {
+            final URI requestURI = request.getUri();
+            if (requestURI.isAbsolute()) {
+                final HttpHost httpHost = URIUtils.extractHost(requestURI);
+                if (httpHost == null) {
+                    throw new ProtocolException("URI does not specify a valid host name: " + requestURI);
                 }
-            } catch (final URISyntaxException ignore) {
+                return httpHost;
             }
+        } catch (final URISyntaxException ignore) {
         }
         return null;
     }
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ConscryptClientTlsStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ConscryptClientTlsStrategy.java
index 9ec8dbf755..e446b084e3 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ConscryptClientTlsStrategy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ConscryptClientTlsStrategy.java
@@ -101,9 +101,8 @@ void applyParameters(final SSLEngine sslEngine, final SSLParameters sslParameter
     TlsDetails createTlsDetails(final SSLEngine sslEngine) {
         if (Conscrypt.isConscrypt(sslEngine)) {
             return new TlsDetails(sslEngine.getSession(), Conscrypt.getApplicationProtocol(sslEngine));
-        } else {
-            return null;
         }
+        return null;
     }
 
     public static boolean isSupported() {
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/TlsSessionValidator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/TlsSessionValidator.java
index b2d49aafcf..4611bab1d9 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/TlsSessionValidator.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/TlsSessionValidator.java
@@ -117,9 +117,8 @@ void verifySession(
                     final ProtocolVersion tls = TLS.parse(sslsession.getProtocol());
                     if (tls.greaterEquals(TLS.V_1_3.version)) {
                         return;
-                    } else {
-                        throw ex;
                     }
+                    throw ex;
                 } catch (final ParseException ex2) {
                     throw ex;
                 }