diff --git a/spark/src/main/java/org/opensearch/sql/spark/dispatcher/model/FullyQualifiedTableName.java b/spark/src/main/java/org/opensearch/sql/spark/dispatcher/model/FullyQualifiedTableName.java
index 6ed3b7447e..fc1513241f 100644
--- a/spark/src/main/java/org/opensearch/sql/spark/dispatcher/model/FullyQualifiedTableName.java
+++ b/spark/src/main/java/org/opensearch/sql/spark/dispatcher/model/FullyQualifiedTableName.java
@@ -52,14 +52,10 @@ public FullyQualifiedTableName(String fullyQualifiedName) {
   public String toFlintName() {
     StringBuilder builder = new StringBuilder();
     if (datasourceName != null) {
-      builder
-          .append(strip(datasourceName, STRIP_CHARS))
-          .append("_");
+      builder.append(strip(datasourceName, STRIP_CHARS)).append("_");
     }
     if (schemaName != null) {
-      builder
-          .append(strip(schemaName, STRIP_CHARS))
-          .append("_");
+      builder.append(strip(schemaName, STRIP_CHARS)).append("_");
     }
     if (tableName != null) {
       builder.append(strip(tableName, STRIP_CHARS));
diff --git a/spark/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryDetails.java b/spark/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryDetails.java
index 961071fa12..576b0772d2 100644
--- a/spark/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryDetails.java
+++ b/spark/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryDetails.java
@@ -86,15 +86,15 @@ public String openSearchIndexName() {
       case COVERING:
         indexName =
             "flint_"
-                + fullyQualifiedTableName.toFlintName() + "_"
-                + strip(getIndexName(), STRIP_CHARS) + "_"
+                + fullyQualifiedTableName.toFlintName()
+                + "_"
+                + strip(getIndexName(), STRIP_CHARS)
+                + "_"
                 + getIndexType().getSuffix();
         break;
       case SKIPPING:
         indexName =
-            "flint_"
-                + fullyQualifiedTableName.toFlintName() + "_"
-                + getIndexType().getSuffix();
+            "flint_" + fullyQualifiedTableName.toFlintName() + "_" + getIndexType().getSuffix();
         break;
       case MATERIALIZED_VIEW:
         indexName = "flint_" + new FullyQualifiedTableName(mvName).toFlintName();
diff --git a/spark/src/test/java/org/opensearch/sql/spark/utils/SQLQueryUtilsTest.java b/spark/src/test/java/org/opensearch/sql/spark/utils/SQLQueryUtilsTest.java
index ad49d9b351..f5226206ab 100644
--- a/spark/src/test/java/org/opensearch/sql/spark/utils/SQLQueryUtilsTest.java
+++ b/spark/src/test/java/org/opensearch/sql/spark/utils/SQLQueryUtilsTest.java
@@ -104,21 +104,22 @@ void testErrorScenarios() {
   @Test
   void testExtractionFromFlintSkippingIndexQueries() {
     String[] createSkippingIndexQueries = {
-        "CREATE SKIPPING INDEX ON myS3.default.alb_logs (l_orderkey VALUE_SET)",
-        "CREATE SKIPPING INDEX IF NOT EXISTS"
-            + " ON myS3.default.alb_logs (l_orderkey VALUE_SET) "
-            + " WITH (auto_refresh = true)",
-        "CREATE SKIPPING INDEX ON myS3.default.alb_logs(l_orderkey VALUE_SET)" +
-            " WITH (auto_refresh = true)",
-        "CREATE SKIPPING INDEX ON myS3.default.alb_logs(l_orderkey VALUE_SET) "
-            + " WHERE elb_status_code = 500 "
-            + " WITH (auto_refresh = true)"
+      "CREATE SKIPPING INDEX ON myS3.default.alb_logs (l_orderkey VALUE_SET)",
+      "CREATE SKIPPING INDEX IF NOT EXISTS"
+          + " ON myS3.default.alb_logs (l_orderkey VALUE_SET) "
+          + " WITH (auto_refresh = true)",
+      "CREATE SKIPPING INDEX ON myS3.default.alb_logs(l_orderkey VALUE_SET)"
+          + " WITH (auto_refresh = true)",
+      "CREATE SKIPPING INDEX ON myS3.default.alb_logs(l_orderkey VALUE_SET) "
+          + " WHERE elb_status_code = 500 "
+          + " WITH (auto_refresh = true)"
     };
 
     for (String query : createSkippingIndexQueries) {
       Assertions.assertTrue(SQLQueryUtils.isFlintExtensionQuery(query), "Failed query: " + query);
       IndexQueryDetails indexQueryDetails = SQLQueryUtils.extractIndexDetails(query);
-      FullyQualifiedTableName fullyQualifiedTableName = indexQueryDetails.getFullyQualifiedTableName();
+      FullyQualifiedTableName fullyQualifiedTableName =
+          indexQueryDetails.getFullyQualifiedTableName();
 
       Assertions.assertNull(indexQueryDetails.getIndexName());
       Assertions.assertEquals("myS3", fullyQualifiedTableName.getDatasourceName());
@@ -130,21 +131,22 @@ void testExtractionFromFlintSkippingIndexQueries() {
   @Test
   void testExtractionFromFlintCoveringIndexQueries() {
     String[] createCoveredIndexQueries = {
-        "CREATE INDEX elb_and_requestUri ON myS3.default.alb_logs(l_orderkey, l_quantity)",
-        "CREATE INDEX IF NOT EXISTS elb_and_requestUri "
-            + " ON myS3.default.alb_logs(l_orderkey, l_quantity) "
-            + " WITH (auto_refresh = true)",
-        "CREATE INDEX elb_and_requestUri ON myS3.default.alb_logs(l_orderkey, l_quantity)" +
-            " WITH (auto_refresh = true)",
-        "CREATE INDEX elb_and_requestUri ON myS3.default.alb_logs(l_orderkey, l_quantity) "
-            + " WHERE elb_status_code = 500 "
-            + " WITH (auto_refresh = true)"
+      "CREATE INDEX elb_and_requestUri ON myS3.default.alb_logs(l_orderkey, l_quantity)",
+      "CREATE INDEX IF NOT EXISTS elb_and_requestUri "
+          + " ON myS3.default.alb_logs(l_orderkey, l_quantity) "
+          + " WITH (auto_refresh = true)",
+      "CREATE INDEX elb_and_requestUri ON myS3.default.alb_logs(l_orderkey, l_quantity)"
+          + " WITH (auto_refresh = true)",
+      "CREATE INDEX elb_and_requestUri ON myS3.default.alb_logs(l_orderkey, l_quantity) "
+          + " WHERE elb_status_code = 500 "
+          + " WITH (auto_refresh = true)"
     };
 
     for (String query : createCoveredIndexQueries) {
       Assertions.assertTrue(SQLQueryUtils.isFlintExtensionQuery(query), "Failed query: " + query);
       IndexQueryDetails indexQueryDetails = SQLQueryUtils.extractIndexDetails(query);
-      FullyQualifiedTableName fullyQualifiedTableName = indexQueryDetails.getFullyQualifiedTableName();
+      FullyQualifiedTableName fullyQualifiedTableName =
+          indexQueryDetails.getFullyQualifiedTableName();
 
       Assertions.assertEquals("elb_and_requestUri", indexQueryDetails.getIndexName());
       Assertions.assertEquals("myS3", fullyQualifiedTableName.getDatasourceName());