diff --git a/amazon-sns-java-messaging-lib-template/src/main/java/com/amazon/sns/messaging/lib/concurrent/AmazonSnsThreadPoolExecutor.java b/amazon-sns-java-messaging-lib-template/src/main/java/com/amazon/sns/messaging/lib/concurrent/AmazonSnsThreadPoolExecutor.java
index 04bf8a7..a02a151 100644
--- a/amazon-sns-java-messaging-lib-template/src/main/java/com/amazon/sns/messaging/lib/concurrent/AmazonSnsThreadPoolExecutor.java
+++ b/amazon-sns-java-messaging-lib-template/src/main/java/com/amazon/sns/messaging/lib/concurrent/AmazonSnsThreadPoolExecutor.java
@@ -20,12 +20,12 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-// @formatter:off
 /**
  * A {@link ThreadPoolExecutor} configured for Amazon SNS publishing. Uses a
- * {@link SynchronousQueue} with zero core threads, allowing threads to be created
- * on demand up to the specified maximum pool size. Tasks that cannot be accepted
- * immediately by the queue will block up to 30 seconds via {@link BlockingSubmissionPolicy}.
+ * {@link SynchronousQueue} with zero core threads, allowing threads to be
+ * created on demand up to the specified maximum pool size. Tasks that cannot be
+ * accepted immediately by the queue will block up to 30 seconds via
+ * {@link BlockingSubmissionPolicy}.
  */
 public class AmazonSnsThreadPoolExecutor extends ThreadPoolExecutor {
 
diff --git a/amazon-sns-java-messaging-lib-v1/src/main/java/com/amazon/sns/messaging/lib/core/AmazonSnsTemplate.java b/amazon-sns-java-messaging-lib-v1/src/main/java/com/amazon/sns/messaging/lib/core/AmazonSnsTemplate.java
index 481b357..56866c7 100644
--- a/amazon-sns-java-messaging-lib-v1/src/main/java/com/amazon/sns/messaging/lib/core/AmazonSnsTemplate.java
+++ b/amazon-sns-java-messaging-lib-v1/src/main/java/com/amazon/sns/messaging/lib/core/AmazonSnsTemplate.java
@@ -77,6 +77,7 @@ public static <E> Builder<AmazonSNS, PublishBatchRequest, PublishBatchResult, E,
    * Creates a new v1 SNS template with default settings.
    *
    * @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} instead
+   *
    * @param amazonSnsClient the v1 {@link AmazonSNS} client
    * @param topicProperty   the topic configuration
    */
@@ -91,6 +92,7 @@ public AmazonSnsTemplate(
    * Creates a new v1 SNS template with a custom publish decorator.
    *
    * @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} and {@link Builder#publishDecorator(UnaryOperator)} instead
+   *
    * @param amazonSnsClient  the v1 {@link AmazonSNS} client
    * @param topicProperty    the topic configuration
    * @param publishDecorator a decorator for the publish batch request
@@ -107,6 +109,7 @@ public AmazonSnsTemplate(
    * Creates a new v1 SNS template with a custom topic request queue.
    *
    * @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} and {@link Builder#topicRequests(BlockingQueue)} instead
+   *
    * @param amazonSnsClient the v1 {@link AmazonSNS} client
    * @param topicProperty   the topic configuration
    * @param topicRequests   the blocking queue for topic requests
@@ -123,6 +126,7 @@ public AmazonSnsTemplate(
    * Creates a new v1 SNS template with a custom queue and publish decorator.
    *
    * @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} with {@link Builder#topicRequests(BlockingQueue)} and {@link Builder#publishDecorator(UnaryOperator)} instead
+   *
    * @param amazonSnsClient  the v1 {@link AmazonSNS} client
    * @param topicProperty    the topic configuration
    * @param topicRequests    the blocking queue for topic requests
@@ -141,6 +145,7 @@ public AmazonSnsTemplate(
    * Creates a new v1 SNS template with a custom ObjectMapper.
    *
    * @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} and {@link Builder#objectMapper(ObjectMapper)} instead
+   *
    * @param amazonSnsClient the v1 {@link AmazonSNS} client
    * @param topicProperty   the topic configuration
    * @param objectMapper    the Jackson ObjectMapper for payload serialization
@@ -157,6 +162,7 @@ public AmazonSnsTemplate(
    * Creates a new v1 SNS template with a custom ObjectMapper and publish decorator.
    *
    * @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} with {@link Builder#objectMapper(ObjectMapper)} and {@link Builder#publishDecorator(UnaryOperator)} instead
+   *
    * @param amazonSnsClient  the v1 {@link AmazonSNS} client
    * @param topicProperty    the topic configuration
    * @param objectMapper     the Jackson ObjectMapper for payload serialization
@@ -175,6 +181,7 @@ public AmazonSnsTemplate(
    * Creates a new v1 SNS template with a custom queue and ObjectMapper.
    *
    * @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} with {@link Builder#topicRequests(BlockingQueue)} and {@link Builder#objectMapper(ObjectMapper)} instead
+   *
    * @param amazonSnsClient the v1 {@link AmazonSNS} client
    * @param topicProperty   the topic configuration
    * @param topicRequests   the blocking queue for topic requests
@@ -193,6 +200,7 @@ public AmazonSnsTemplate(
    * Creates a new v1 SNS template with full custom configuration.
    *
    * @deprecated since 1.3.0, use {@link #builder(AmazonSNS, TopicProperty)} with builder setters instead
+   *
    * @param amazonSnsClient  the v1 {@link AmazonSNS} client
    * @param topicProperty    the topic configuration
    * @param topicRequests    the blocking queue for topic requests
diff --git a/amazon-sns-java-messaging-lib-v2/src/main/java/com/amazon/sns/messaging/lib/core/AmazonSnsTemplate.java b/amazon-sns-java-messaging-lib-v2/src/main/java/com/amazon/sns/messaging/lib/core/AmazonSnsTemplate.java
index e631ceb..bbc2153 100644
--- a/amazon-sns-java-messaging-lib-v2/src/main/java/com/amazon/sns/messaging/lib/core/AmazonSnsTemplate.java
+++ b/amazon-sns-java-messaging-lib-v2/src/main/java/com/amazon/sns/messaging/lib/core/AmazonSnsTemplate.java
@@ -78,6 +78,7 @@ public static <E> Builder<SnsClient, PublishBatchRequest, PublishBatchResponse,
    * Creates a new v2 SNS template with default settings.
    *
    * @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} instead
+   *
    * @param amazonSnsClient the v2 {@link SnsClient}
    * @param topicProperty   the topic configuration
    */
@@ -92,6 +93,7 @@ public AmazonSnsTemplate(
    * Creates a new v2 SNS template with a custom publish decorator.
    *
    * @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} and {@link Builder#publishDecorator(UnaryOperator)} instead
+   *
    * @param amazonSnsClient  the v2 {@link SnsClient}
    * @param topicProperty    the topic configuration
    * @param publishDecorator a decorator for the publish batch request
@@ -108,6 +110,7 @@ public AmazonSnsTemplate(
    * Creates a new v2 SNS template with a custom topic request queue.
    *
    * @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} and {@link Builder#topicRequests(BlockingQueue)} instead
+   *
    * @param amazonSnsClient the v2 {@link SnsClient}
    * @param topicProperty   the topic configuration
    * @param topicRequests   the blocking queue for topic requests
@@ -124,6 +127,7 @@ public AmazonSnsTemplate(
    * Creates a new v2 SNS template with a custom queue and publish decorator.
    *
    * @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} with {@link Builder#topicRequests(BlockingQueue)} and {@link Builder#publishDecorator(UnaryOperator)} instead
+   *
    * @param amazonSnsClient  the v2 {@link SnsClient}
    * @param topicProperty    the topic configuration
    * @param topicRequests    the blocking queue for topic requests
@@ -142,6 +146,7 @@ public AmazonSnsTemplate(
    * Creates a new v2 SNS template with a custom ObjectMapper.
    *
    * @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} and {@link Builder#objectMapper(ObjectMapper)} instead
+   *
    * @param amazonSnsClient the v2 {@link SnsClient}
    * @param topicProperty   the topic configuration
    * @param objectMapper    the Jackson ObjectMapper for payload serialization
@@ -158,6 +163,7 @@ public AmazonSnsTemplate(
    * Creates a new v2 SNS template with a custom ObjectMapper and publish decorator.
    *
    * @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} with {@link Builder#objectMapper(ObjectMapper)} and {@link Builder#publishDecorator(UnaryOperator)} instead
+   *
    * @param amazonSnsClient  the v2 {@link SnsClient}
    * @param topicProperty    the topic configuration
    * @param objectMapper     the Jackson ObjectMapper for payload serialization
@@ -176,6 +182,7 @@ public AmazonSnsTemplate(
    * Creates a new v2 SNS template with a custom queue and ObjectMapper.
    *
    * @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} with {@link Builder#topicRequests(BlockingQueue)} and {@link Builder#objectMapper(ObjectMapper)} instead
+   *
    * @param amazonSnsClient the v2 {@link SnsClient}
    * @param topicProperty   the topic configuration
    * @param topicRequests   the blocking queue for topic requests
@@ -194,6 +201,7 @@ public AmazonSnsTemplate(
    * Creates a new v2 SNS template with full custom configuration.
    *
    * @deprecated since 1.3.0, use {@link #builder(SnsClient, TopicProperty)} with builder setters instead
+   *
    * @param amazonSnsClient  the v2 {@link SnsClient}
    * @param topicProperty    the topic configuration
    * @param topicRequests    the blocking queue for topic requests