diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java b/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java
index 9a25a94da9..cf82c2b070 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java
@@ -15,7 +15,9 @@
  */
 public class CloseCursor extends UnresolvedPlan {
 
-  /** An instance of {@link Cursor} */
+  /**
+   * An instance of {@link FetchCursor}.
+   */
   private UnresolvedPlan cursor;
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/executor/execution/CommandPlan.java b/core/src/main/java/org/opensearch/sql/executor/execution/CommandPlan.java
index 3cac41d3d0..ebc557d791 100644
--- a/core/src/main/java/org/opensearch/sql/executor/execution/CommandPlan.java
+++ b/core/src/main/java/org/opensearch/sql/executor/execution/CommandPlan.java
@@ -31,6 +31,7 @@ public class CommandPlan extends AbstractPlan {
 
   protected final ResponseListener<ExecutionEngine.QueryResponse> listener;
 
+  /** Constructor. */
   public CommandPlan(QueryId queryId, UnresolvedPlan plan, QueryService queryService,
                      ResponseListener<ExecutionEngine.QueryResponse> listener) {
     super(queryId);
diff --git a/core/src/main/java/org/opensearch/sql/executor/execution/QueryPlanFactory.java b/core/src/main/java/org/opensearch/sql/executor/execution/QueryPlanFactory.java
index a86031e519..903cecd166 100644
--- a/core/src/main/java/org/opensearch/sql/executor/execution/QueryPlanFactory.java
+++ b/core/src/main/java/org/opensearch/sql/executor/execution/QueryPlanFactory.java
@@ -17,8 +17,8 @@
 import org.opensearch.sql.ast.statement.Explain;
 import org.opensearch.sql.ast.statement.Query;
 import org.opensearch.sql.ast.statement.Statement;
-import org.opensearch.sql.ast.tree.FetchCursor;
 import org.opensearch.sql.ast.tree.CloseCursor;
+import org.opensearch.sql.ast.tree.FetchCursor;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.exception.UnsupportedCursorRequestException;
diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitorTest.java
index ad0b2944bd..8c307dfe97 100644
--- a/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitorTest.java
+++ b/core/src/test/java/org/opensearch/sql/planner/physical/PhysicalPlanNodeVisitorTest.java
@@ -32,7 +32,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
-
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -144,7 +143,7 @@ public static Stream<Arguments> getPhysicalPlanForTest() {
 
   @ParameterizedTest(name = "{1}")
   @MethodSource("getPhysicalPlanForTest")
-  public void PhysicalPlanVisitor_should_return_null(PhysicalPlan plan, String name) {
+  public void test_PhysicalPlanVisitor_should_return_null(PhysicalPlan plan, String name) {
     assertNull(plan.accept(new PhysicalPlanNodeVisitor<Integer, Object>() {
     }, null));
   }
diff --git a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/CommandResponseFormatterTest.java b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/CommandResponseFormatterTest.java
index dcbead8027..17bd8aee8d 100644
--- a/protocol/src/test/java/org/opensearch/sql/protocol/response/format/CommandResponseFormatterTest.java
+++ b/protocol/src/test/java/org/opensearch/sql/protocol/response/format/CommandResponseFormatterTest.java
@@ -29,7 +29,7 @@ public class CommandResponseFormatterTest {
   public void produces_always_same_output_for_any_query_response() {
     var formatter = new CommandResponseFormatter();
     assertEquals(formatter.format(mock(QueryResult.class)),
-      formatter.format(mock(QueryResult.class)));
+        formatter.format(mock(QueryResult.class)));
 
     QueryResult response = new QueryResult(
         new ExecutionEngine.Schema(ImmutableList.of(