diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java
index a0df19711..c057a22cb 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java
@@ -1323,7 +1323,7 @@ public Map<String, String> getValidateResult() {
    * @param entityId the entity id
    * @param actions a set of operation actions: READ/WRITE/LIST/DELETE/ALL
    * @param locations a set of locations to verify
-   * @return a Map of <location, validate result>, a validate result value looks like this
+   * @return a Map of {@code <location, validate result>}, a validate result value looks like this
    *     <pre>
    * {
    *   "status" : "failure",
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManagerImpl.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManagerImpl.java
index 10396aba0..b05129fa3 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManagerImpl.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManagerImpl.java
@@ -855,7 +855,7 @@ public String serializeProperties(PolarisCallContext callCtx, Map<String, String
   }
 
   /**
-   * Given the serialized properties, deserialize those to a Map<String, String>
+   * Given the serialized properties, deserialize those to a {@code Map<String, String>}
    *
    * @param properties a JSON string representing the set of properties
    * @return a Map of string
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisObjectMapperUtil.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisObjectMapperUtil.java
index b4c0aff59..7f85580f5 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisObjectMapperUtil.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisObjectMapperUtil.java
@@ -89,7 +89,7 @@ public static <T> T deserialize(PolarisCallContext callCtx, String text, Class<T
   }
 
   /**
-   * Given the serialized properties, deserialize those to a Map<String, String>
+   * Given the serialized properties, deserialize those to a {@code Map<String, String>}
    *
    * @param properties a JSON string representing the set of properties
    * @return a Map of string
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageConfigurationInfo.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageConfigurationInfo.java
index a169cd555..504e36878 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageConfigurationInfo.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageConfigurationInfo.java
@@ -51,7 +51,7 @@
  * <pre>
  * 1. locations that allows polaris to get access to
  * 2. cloud identity info that a service principle can request access token to the locations
- * </pre</>
+ * </pre>
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
 @JsonSubTypes({
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegration.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegration.java
index 26554c6fd..7067ec1e7 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegration.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegration.java
@@ -75,8 +75,8 @@ public abstract EnumMap<PolarisCredentialProperty, String> getSubscopedCreds(
    *
    * @param actions a set of operation actions to validate, like LIST/READ/DELETE/WRITE/ALL
    * @param locations a set of locations to get access to
-   * @return A Map of string, representing the result of validation, the key value is <location,
-   *     validate result>. A validate result looks like this
+   * @return A Map of string, representing the result of validation, the key value is {@code
+   *     <location, validate result>}. A validate result looks like this
    *     <pre>
    * {
    *   "status" : "failure",