diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java b/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java
index e34127c9d3..d6a260ad0b 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java
@@ -10,7 +10,7 @@
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** An unresolved plan that represents fetching the next batch in paginationed plan. */
+/** An unresolved plan that represents fetching the next batch in paginated plan. */
 @RequiredArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 public class FetchCursor extends UnresolvedPlan {
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java b/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java
index 711a8a0ec5..a67a943dcb 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java
@@ -15,7 +15,7 @@
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/** ASTNode for Table Function. */
+/** AST Node for Table Function. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @RequiredArgsConstructor
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprDateValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprDateValue.java
index d1f6f83815..05726550bd 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprDateValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprDateValue.java
@@ -33,7 +33,7 @@ public ExprDateValue(String date) {
       this.date = LocalDate.parse(date, DATE_TIME_FORMATTER_VARIABLE_NANOS_OPTIONAL);
     } catch (DateTimeParseException e) {
       throw new SemanticCheckException(
-          String.format("date:%s in unsupported format, please use " + "yyyy-MM-dd", date));
+          String.format("date:%s in unsupported format, please use yyyy-MM-dd", date));
     }
   }
 
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprDatetimeValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprDatetimeValue.java
index 02fa8354b8..7e2a774606 100644
--- a/core/src/main/java/org/opensearch/sql/data/model/ExprDatetimeValue.java
+++ b/core/src/main/java/org/opensearch/sql/data/model/ExprDatetimeValue.java
@@ -33,7 +33,7 @@ public ExprDatetimeValue(String datetime) {
     } catch (DateTimeParseException e) {
       throw new SemanticCheckException(
           String.format(
-              "datetime:%s in unsupported format, please " + "use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
+              "datetime:%s in unsupported format, please use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
               datetime));
     }
   }