diff --git a/libs/encryption-sdk/src/main/java/org/opensearch/encryption/CryptoManager.java b/libs/encryption-sdk/src/main/java/org/opensearch/encryption/CryptoManager.java
index 159432adf7472..8e1fc8570d552 100644
--- a/libs/encryption-sdk/src/main/java/org/opensearch/encryption/CryptoManager.java
+++ b/libs/encryption-sdk/src/main/java/org/opensearch/encryption/CryptoManager.java
@@ -14,7 +14,7 @@
 /**
  * Crypto plugin interface used for encryption and decryption.
  */
-public interface CryptoManager<T , U> extends RefCounted {
+public interface CryptoManager<T, U> extends RefCounted {
 
     /**
      * @return key provider type
diff --git a/libs/encryption-sdk/src/main/java/org/opensearch/encryption/CryptoManagerFactory.java b/libs/encryption-sdk/src/main/java/org/opensearch/encryption/CryptoManagerFactory.java
index dbd7b93040f43..b6e0b5a6d4ed7 100644
--- a/libs/encryption-sdk/src/main/java/org/opensearch/encryption/CryptoManagerFactory.java
+++ b/libs/encryption-sdk/src/main/java/org/opensearch/encryption/CryptoManagerFactory.java
@@ -66,7 +66,7 @@ private String validateAndGetAlgorithmId(String algorithm) {
     }
 
     // package private for tests
-    CryptoHandler<? , ?> createCryptoProvider(
+    CryptoHandler<?, ?> createCryptoProvider(
         String algorithm,
         CachingCryptoMaterialsManager materialsManager,
         MasterKeyProvider masterKeyProvider
@@ -103,7 +103,12 @@ CachingCryptoMaterialsManager createMaterialsManager(MasterKeyProvider masterKey
     }
 
     // package private for tests
-    <T, U> CryptoManager<?, ?> createCryptoManager(CryptoHandler<T, U> cryptoHandler, String keyProviderType, String keyProviderName, Runnable onClose) {
+    <T, U> CryptoManager<?, ?> createCryptoManager(
+        CryptoHandler<T, U> cryptoHandler,
+        String keyProviderType,
+        String keyProviderName,
+        Runnable onClose
+    ) {
         return new CryptoManagerImpl<T, U>(keyProviderName, keyProviderType) {
             @Override
             protected void closeInternal() {
@@ -127,11 +132,10 @@ public CryptoHandler<T, U> getCryptoProvider() {
         };
     }
 
-    private static abstract class CryptoManagerImpl<T , U> extends AbstractRefCounted implements CryptoManager<T, U> {
+    private static abstract class CryptoManagerImpl<T, U> extends AbstractRefCounted implements CryptoManager<T, U> {
         public CryptoManagerImpl(String keyProviderName, String keyProviderType) {
             super(keyProviderName + "-" + keyProviderType);
         }
     }
 
-
 }
diff --git a/libs/encryption-sdk/src/main/java/org/opensearch/encryption/frame/core/EncryptionMetadata.java b/libs/encryption-sdk/src/main/java/org/opensearch/encryption/frame/core/EncryptionMetadata.java
index a4479babe851c..0495336ee9e09 100644
--- a/libs/encryption-sdk/src/main/java/org/opensearch/encryption/frame/core/EncryptionMetadata.java
+++ b/libs/encryption-sdk/src/main/java/org/opensearch/encryption/frame/core/EncryptionMetadata.java
@@ -45,7 +45,6 @@
 import java.util.Map;
 
 @SuppressWarnings({ "rawtypes" })
-// Move this to EncryptionHandler
 public class EncryptionMetadata {
     private static final CiphertextType CIPHERTEXT_TYPE = CiphertextType.CUSTOMER_AUTHENTICATED_ENCRYPTED_DATA;
 
diff --git a/libs/encryption-sdk/src/test/java/org/opensearch/encryption/frame/CryptoTests.java b/libs/encryption-sdk/src/test/java/org/opensearch/encryption/frame/CryptoTests.java
index 146cf187bf2a1..7e82de8e8805b 100644
--- a/libs/encryption-sdk/src/test/java/org/opensearch/encryption/frame/CryptoTests.java
+++ b/libs/encryption-sdk/src/test/java/org/opensearch/encryption/frame/CryptoTests.java
@@ -220,7 +220,7 @@ private long decryptAndVerify(InputStream encryptedStream, long encSize, File fi
 
     public void testMultiPartStreamsEncryption() throws IOException, URISyntaxException {
         EncryptionMetadata cryptoContextObj = frameCryptoProvider.initEncryptionMetadata();
-        EncryptionMetadata encryptionMetadata =  cryptoContextObj;
+        EncryptionMetadata encryptionMetadata = cryptoContextObj;
         String path = CryptoTests.class.getResource("/raw_content_for_crypto_test").toURI().getPath();
         File file = new File(path);
         byte[] encryptedContent = new byte[1024 * 20];
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
index 4ab26e9e48f92..81ab7a62db939 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
@@ -14,7 +14,7 @@
  * the Apache License, Version 2.0 (the "License"); you may
  * not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *Ø
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,