diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagePersister.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagePersister.java
index 115ea5d9c..6d15fefb8 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagePersister.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagePersister.java
@@ -45,18 +45,18 @@ public class MessagePersister implements Managed {
 
   private static final String OVERSIZED_QUEUE_COUNTER_NAME = name(MessagePersister.class, "persistQueueOversized");
 
-  private final Timer getQueuesTimer = Metrics.timer(name(MessagePersister.class, "getQueues"));
-  private final Timer persistQueueTimer = Metrics.timer(name(MessagePersister.class, "persistQueue"));
-  private final Counter persistQueueExceptionMeter = Metrics.counter(
-      name(MessagePersister.class, "persistQueueException"));
-  private static final Counter trimmedMessageCounter = Metrics.counter(name(MessagePersister.class, "trimmedMessage"));
-  private static final Counter trimmedMessageBytesCounter = Metrics.counter(name(MessagePersister.class, "trimmedMessageBytes"));
-  private final DistributionSummary queueCountDistributionSummery = DistributionSummary.builder(
+  private static final Timer GET_QUEUES_TIMER = Metrics.timer(name(MessagePersister.class, "getQueues"));
+  private static final Timer PERSIST_QUEUE_TIMER = Metrics.timer(name(MessagePersister.class, "persistQueue"));
+  private static final Counter PERSIST_QUEUE_EXCEPTION_METER =
+      Metrics.counter(name(MessagePersister.class, "persistQueueException"));
+  private static final Counter TRIMMED_MESSAGE_COUNTER = Metrics.counter(name(MessagePersister.class, "trimmedMessage"));
+  private static final Counter TRIMMED_MESSAGE_BYTES_COUNTER = Metrics.counter(name(MessagePersister.class, "trimmedMessageBytes"));
+  private static final DistributionSummary QUEUE_COUNT_DISTRIBUTION_SUMMARY = DistributionSummary.builder(
           name(MessagePersister.class, "queueCount"))
       .publishPercentiles(0.5, 0.75, 0.95, 0.99, 0.999)
       .distributionStatisticExpiry(Duration.ofMinutes(10))
       .register(Metrics.globalRegistry);
-  private final DistributionSummary queueSizeDistributionSummery = DistributionSummary.builder(
+  private static final DistributionSummary QUEUE_SIZE_DISTRIBUTION_SUMMARY = DistributionSummary.builder(
           name(MessagePersister.class, "queueSize"))
       .publishPercentiles(0.5, 0.75, 0.95, 0.99, 0.999)
       .distributionStatisticExpiry(Duration.ofMinutes(10))
@@ -64,7 +64,6 @@ public class MessagePersister implements Managed {
 
   static final int QUEUE_BATCH_LIMIT = 100;
   static final int MESSAGE_BATCH_LIMIT = 100;
-  static final int CACHE_PAGE_SIZE = 100;
 
   private static final long EXCEPTION_PAUSE_MILLIS = Duration.ofSeconds(3).toMillis();
 
@@ -93,7 +92,7 @@ public class MessagePersister implements Managed {
               .isPersistenceEnabled()) {
             try {
               final int queuesPersisted = persistNextQueues(Instant.now());
-              queueCountDistributionSummery.record(queuesPersisted);
+              QUEUE_COUNT_DISTRIBUTION_SUMMARY.record(queuesPersisted);
 
               if (queuesPersisted == 0) {
                 Util.sleep(100);
@@ -145,7 +144,7 @@ public class MessagePersister implements Managed {
     int queuesPersisted = 0;
 
     do {
-      queuesToPersist = getQueuesTimer.record(
+      queuesToPersist = GET_QUEUES_TIMER.record(
           () -> messagesCache.getQueuesToPersist(slot, currentTime.minus(persistDelay), QUEUE_BATCH_LIMIT));
 
       for (final String queue : queuesToPersist) {
@@ -165,7 +164,7 @@ public class MessagePersister implements Managed {
         try {
           persistQueue(maybeAccount.get(), maybeDevice.get());
         } catch (final Exception e) {
-          persistQueueExceptionMeter.increment();
+          PERSIST_QUEUE_EXCEPTION_METER.increment();
           logger.warn("Failed to persist queue {}::{}; will schedule for retry", accountUuid, deviceId, e);
 
           messagesCache.addQueueToPersist(accountUuid, deviceId);
@@ -216,7 +215,7 @@ public class MessagePersister implements Managed {
 
       } while (!messages.isEmpty());
 
-      queueSizeDistributionSummery.record(messageCount);
+      QUEUE_SIZE_DISTRIBUTION_SUMMARY.record(messageCount);
     } catch (ItemCollectionSizeLimitExceededException e) {
       final boolean isPrimary = deviceId == Device.PRIMARY_ID;
       Metrics.counter(OVERSIZED_QUEUE_COUNTER_NAME, "primary", String.valueOf(isPrimary)).increment();
@@ -233,7 +232,7 @@ public class MessagePersister implements Managed {
       }
     } finally {
       messagesCache.unlockQueueForPersistence(accountUuid, deviceId);
-      sample.stop(persistQueueTimer);
+      sample.stop(PERSIST_QUEUE_TIMER);
     }
 
   }
@@ -273,8 +272,8 @@ public class MessagePersister implements Managed {
         .takeWhile(Optional::isPresent)
         .flatMap(maybeEnvelope -> {
           final MessageProtos.Envelope envelope = maybeEnvelope.get();
-          trimmedMessageCounter.increment();
-          trimmedMessageBytesCounter.increment(envelope.getSerializedSize());
+          TRIMMED_MESSAGE_COUNTER.increment();
+          TRIMMED_MESSAGE_BYTES_COUNTER.increment(envelope.getSerializedSize());
           return Mono
               .fromCompletionStage(() -> messagesManager
                   .delete(aci, device, UUID.fromString(envelope.getServerGuid()), envelope.getServerTimestamp()))