diff --git a/src/main/java/org/sitmun/proxy/middleware/config/ProxyMiddlewareConstants.java b/src/main/java/org/sitmun/proxy/middleware/config/ProxyMiddlewareConstants.java
index 1050f48..1b97dd5 100644
--- a/src/main/java/org/sitmun/proxy/middleware/config/ProxyMiddlewareConstants.java
+++ b/src/main/java/org/sitmun/proxy/middleware/config/ProxyMiddlewareConstants.java
@@ -5,9 +5,7 @@
  * backend-core module to ensure proper communication.
  */
 public class ProxyMiddlewareConstants {
-  private ProxyMiddlewareConstants() {
-    // Private constructor to prevent instantiation
-  }
+  private ProxyMiddlewareConstants() {}
 
   /**
    * Header name for authenticating proxy middleware requests to the backend configuration API. This
diff --git a/src/main/java/org/sitmun/proxy/middleware/dto/ProblemTypes.java b/src/main/java/org/sitmun/proxy/middleware/dto/ProblemTypes.java
index 275ea8f..7ddc510 100644
--- a/src/main/java/org/sitmun/proxy/middleware/dto/ProblemTypes.java
+++ b/src/main/java/org/sitmun/proxy/middleware/dto/ProblemTypes.java
@@ -32,7 +32,5 @@ public final class ProblemTypes {
   public static final String PROXY_UPSTREAM_AUTHORIZATION_ERROR =
       BASE_URI + "proxy-upstream-auth-error";
 
-  private ProblemTypes() {
-    // Prevent instantiation
-  }
+  private ProblemTypes() {}
 }
diff --git a/src/main/java/org/sitmun/proxy/middleware/protocols/http/HttpClientFactoryService.java b/src/main/java/org/sitmun/proxy/middleware/protocols/http/HttpClientFactoryService.java
index 44eee1b..8af991f 100644
--- a/src/main/java/org/sitmun/proxy/middleware/protocols/http/HttpClientFactoryService.java
+++ b/src/main/java/org/sitmun/proxy/middleware/protocols/http/HttpClientFactoryService.java
@@ -68,7 +68,6 @@ private static OkHttpClient.Builder configureToIgnoreCertificate(OkHttpClient.Bu
     log.warn("Ignore SSL Certificate");
     try {
 
-      // Create a trust manager that does not validate certificate chains
       final TrustManager[] trustAllCerts =
           new TrustManager[] {
             new X509TrustManager() {
@@ -89,10 +88,8 @@ public X509Certificate[] getAcceptedIssuers() {
             }
           };
 
-      // Install the all-trusting trust manager
       final SSLContext sslContext = SSLContext.getInstance("SSL");
       sslContext.init(null, trustAllCerts, new SecureRandom());
-      // Create a ssl socket factory with our all-trusting manager
       final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
 
       builder.sslSocketFactory(sslSocketFactory, (X509TrustManager) trustAllCerts[0]);
diff --git a/src/main/java/org/sitmun/proxy/middleware/protocols/http/HttpRequestDecoratorAddQueryParamSecurity.java b/src/main/java/org/sitmun/proxy/middleware/protocols/http/HttpRequestDecoratorAddQueryParamSecurity.java
index 707d78d..b176e2c 100644
--- a/src/main/java/org/sitmun/proxy/middleware/protocols/http/HttpRequestDecoratorAddQueryParamSecurity.java
+++ b/src/main/java/org/sitmun/proxy/middleware/protocols/http/HttpRequestDecoratorAddQueryParamSecurity.java
@@ -5,7 +5,6 @@
 import org.sitmun.proxy.middleware.decorator.RequestDecorator;
 import org.springframework.stereotype.Component;
 
-/** Decorator that appends security query parameters to the request URL. */
 @Component
 public class HttpRequestDecoratorAddQueryParamSecurity implements RequestDecorator {
 
diff --git a/src/main/java/org/sitmun/proxy/middleware/utils/UriTemplateExpander.java b/src/main/java/org/sitmun/proxy/middleware/utils/UriTemplateExpander.java
index 3e1a8c8..dbeafd2 100644
--- a/src/main/java/org/sitmun/proxy/middleware/utils/UriTemplateExpander.java
+++ b/src/main/java/org/sitmun/proxy/middleware/utils/UriTemplateExpander.java
@@ -9,9 +9,6 @@
  * Utility class for expanding URI templates using RFC 6570 standard. ONLY handles {variable} syntax
  * for URIs.
  *
- * <p>This class provides methods to expand URI templates according to RFC 6570 specification using
- * the Handy URI Templates library.
- *
  * @see <a href="https://tools.ietf.org/html/rfc6570">RFC 6570: URI Template</a>
  */
 public final class UriTemplateExpander {
@@ -95,7 +92,6 @@ public static boolean hasTemplateVariables(String template) {
     if (template == null || template.isEmpty()) {
       return false;
     }
-    // Simple check for {variable} pattern
     return template.contains("{") && template.contains("}");
   }