diff --git a/data/beaconrestapi/src/main/java/tech/pegasys/teku/beaconrestapi/handlers/v1/events/AttesterSlashingEvent.java b/data/beaconrestapi/src/main/java/tech/pegasys/teku/beaconrestapi/handlers/v1/events/AttesterSlashingEvent.java
index 103c0efe7d7..47cd86f5114 100644
--- a/data/beaconrestapi/src/main/java/tech/pegasys/teku/beaconrestapi/handlers/v1/events/AttesterSlashingEvent.java
+++ b/data/beaconrestapi/src/main/java/tech/pegasys/teku/beaconrestapi/handlers/v1/events/AttesterSlashingEvent.java
@@ -16,7 +16,7 @@
 import tech.pegasys.teku.spec.datastructures.operations.AttesterSlashing;
 
 public class AttesterSlashingEvent extends Event<AttesterSlashing> {
-  AttesterSlashingEvent(AttesterSlashing attesterSlashing) {
+  AttesterSlashingEvent(final AttesterSlashing attesterSlashing) {
     super(attesterSlashing.getSchema().getJsonTypeDefinition(), attesterSlashing);
   }
 }
diff --git a/data/beaconrestapi/src/main/java/tech/pegasys/teku/beaconrestapi/handlers/v1/events/ProposerSlashingEvent.java b/data/beaconrestapi/src/main/java/tech/pegasys/teku/beaconrestapi/handlers/v1/events/ProposerSlashingEvent.java
index e14dd698217..f9600dd86f6 100644
--- a/data/beaconrestapi/src/main/java/tech/pegasys/teku/beaconrestapi/handlers/v1/events/ProposerSlashingEvent.java
+++ b/data/beaconrestapi/src/main/java/tech/pegasys/teku/beaconrestapi/handlers/v1/events/ProposerSlashingEvent.java
@@ -16,7 +16,7 @@
 import tech.pegasys.teku.spec.datastructures.operations.ProposerSlashing;
 
 public class ProposerSlashingEvent extends Event<ProposerSlashing> {
-  ProposerSlashingEvent(ProposerSlashing proposerSlashing) {
+  ProposerSlashingEvent(final ProposerSlashing proposerSlashing) {
     super(proposerSlashing.getSchema().getJsonTypeDefinition(), proposerSlashing);
   }
 }
diff --git a/data/provider/src/main/java/tech/pegasys/teku/api/NodeDataProvider.java b/data/provider/src/main/java/tech/pegasys/teku/api/NodeDataProvider.java
index e3593a04687..51348438b8a 100644
--- a/data/provider/src/main/java/tech/pegasys/teku/api/NodeDataProvider.java
+++ b/data/provider/src/main/java/tech/pegasys/teku/api/NodeDataProvider.java
@@ -97,7 +97,7 @@ public NodeDataProvider(
   }
 
   public List<Attestation> getAttestations(
-      Optional<UInt64> maybeSlot, Optional<UInt64> maybeCommitteeIndex) {
+      final Optional<UInt64> maybeSlot, final Optional<UInt64> maybeCommitteeIndex) {
     return attestationPool.getAttestations(maybeSlot, maybeCommitteeIndex);
   }
 
@@ -113,20 +113,22 @@ public List<SignedVoluntaryExit> getVoluntaryExits() {
     return new ArrayList<>(voluntaryExitPool.getAll());
   }
 
-  public SafeFuture<InternalValidationResult> postVoluntaryExit(SignedVoluntaryExit exit) {
+  public SafeFuture<InternalValidationResult> postVoluntaryExit(final SignedVoluntaryExit exit) {
     return voluntaryExitPool.addLocal(exit);
   }
 
-  public SafeFuture<InternalValidationResult> postAttesterSlashing(AttesterSlashing slashing) {
+  public SafeFuture<InternalValidationResult> postAttesterSlashing(
+      final AttesterSlashing slashing) {
     return attesterSlashingPool.addLocal(slashing);
   }
 
-  public SafeFuture<InternalValidationResult> postProposerSlashing(ProposerSlashing slashing) {
+  public SafeFuture<InternalValidationResult> postProposerSlashing(
+      final ProposerSlashing slashing) {
     return proposerSlashingPool.addLocal(slashing);
   }
 
   public List<SignedBlsToExecutionChange> getBlsToExecutionChanges(
-      Optional<Boolean> locallySubmitted) {
+      final Optional<Boolean> locallySubmitted) {
     if (locallySubmitted.isPresent() && locallySubmitted.get()) {
       return new ArrayList<>(blsToExecutionChangePool.getLocallySubmitted());
     }
@@ -168,37 +170,40 @@ private SafeFuture<Optional<SubmitDataError>> addBlsToExecutionChange(
             });
   }
 
-  public void subscribeToReceivedBlocks(ReceivedBlockListener listener) {
+  public void subscribeToReceivedBlocks(final ReceivedBlockListener listener) {
     blockManager.subscribeToReceivedBlocks(listener);
   }
 
-  public void subscribeToReceivedBlobSidecar(NewBlobSidecarSubscriber listener) {
+  public void subscribeToReceivedBlobSidecar(final NewBlobSidecarSubscriber listener) {
     blockBlobSidecarsTrackersPool.subscribeNewBlobSidecar(listener);
   }
 
-  public void subscribeToAttesterSlashing(OperationAddedSubscriber<AttesterSlashing> listener) {
+  public void subscribeToAttesterSlashing(
+      final OperationAddedSubscriber<AttesterSlashing> listener) {
     attesterSlashingPool.subscribeOperationAdded(listener);
   }
 
-  public void subscribeToProposerSlashing(OperationAddedSubscriber<ProposerSlashing> listener) {
+  public void subscribeToProposerSlashing(
+      final OperationAddedSubscriber<ProposerSlashing> listener) {
     proposerSlashingPool.subscribeOperationAdded(listener);
   }
 
-  public void subscribeToValidAttestations(ProcessedAttestationListener listener) {
+  public void subscribeToValidAttestations(final ProcessedAttestationListener listener) {
     attestationManager.subscribeToAllValidAttestations(listener);
   }
 
-  public void subscribeToNewVoluntaryExits(OperationAddedSubscriber<SignedVoluntaryExit> listener) {
+  public void subscribeToNewVoluntaryExits(
+      final OperationAddedSubscriber<SignedVoluntaryExit> listener) {
     voluntaryExitPool.subscribeOperationAdded(listener);
   }
 
   public void subscribeToNewBlsToExecutionChanges(
-      OperationAddedSubscriber<SignedBlsToExecutionChange> listener) {
+      final OperationAddedSubscriber<SignedBlsToExecutionChange> listener) {
     blsToExecutionChangePool.subscribeOperationAdded(listener);
   }
 
   public void subscribeToSyncCommitteeContributions(
-      OperationAddedSubscriber<SignedContributionAndProof> listener) {
+      final OperationAddedSubscriber<SignedContributionAndProof> listener) {
     syncCommitteeContributionPool.subscribeOperationAdded(listener);
   }
 
diff --git a/validator/remote/src/main/java/tech/pegasys/teku/validator/remote/BeaconNodeReadinessManager.java b/validator/remote/src/main/java/tech/pegasys/teku/validator/remote/BeaconNodeReadinessManager.java
index c3ea43b46b4..f4822ea111f 100644
--- a/validator/remote/src/main/java/tech/pegasys/teku/validator/remote/BeaconNodeReadinessManager.java
+++ b/validator/remote/src/main/java/tech/pegasys/teku/validator/remote/BeaconNodeReadinessManager.java
@@ -115,10 +115,10 @@ public void onAttestationAggregationDue(final UInt64 slot) {
   }
 
   @Override
-  public void onAttesterSlashing(AttesterSlashing attesterSlashing) {}
+  public void onAttesterSlashing(final AttesterSlashing attesterSlashing) {}
 
   @Override
-  public void onProposerSlashing(ProposerSlashing proposerSlashing) {}
+  public void onProposerSlashing(final ProposerSlashing proposerSlashing) {}
 
   @Override
   public void onUpdatedValidatorStatuses(