diff --git a/teku/src/main/java/tech/pegasys/teku/cli/subcommand/GenesisCommand.java b/teku/src/main/java/tech/pegasys/teku/cli/subcommand/GenesisCommand.java
index 2d9003dbe76..1b078a5efa2 100644
--- a/teku/src/main/java/tech/pegasys/teku/cli/subcommand/GenesisCommand.java
+++ b/teku/src/main/java/tech/pegasys/teku/cli/subcommand/GenesisCommand.java
@@ -54,7 +54,8 @@ public class GenesisCommand {
       footerHeading = "%n",
       footer = "Teku is licensed under the Apache License 2.0")
   public void generate(
-      @Mixin final MockGenesisParams genesisParams, @Mixin final MinimalEth2NetworkOptions networkOptions)
+      @Mixin final MockGenesisParams genesisParams,
+      @Mixin final MinimalEth2NetworkOptions networkOptions)
       throws IOException {
     // Output to stdout if no file is specified
     final Spec spec = networkOptions.getSpec();
diff --git a/teku/src/main/java/tech/pegasys/teku/cli/subcommand/PeerCommand.java b/teku/src/main/java/tech/pegasys/teku/cli/subcommand/PeerCommand.java
index 0f1395ff644..61131d8ba75 100644
--- a/teku/src/main/java/tech/pegasys/teku/cli/subcommand/PeerCommand.java
+++ b/teku/src/main/java/tech/pegasys/teku/cli/subcommand/PeerCommand.java
@@ -78,7 +78,7 @@ public void generate(
               arity = "1",
               required = true,
               description = "number of peerIDs to generate")
-      final int number) {
+          final int number) {
     try {
       validateParamsAndGenerate(params.outputFile, number);
       spec.commandLine().getOut().println("Generated file " + params.outputFile);
diff --git a/teku/src/main/java/tech/pegasys/teku/cli/subcommand/TransitionCommand.java b/teku/src/main/java/tech/pegasys/teku/cli/subcommand/TransitionCommand.java
index 1eb9b46ee33..2ceb4ac3bbd 100644
--- a/teku/src/main/java/tech/pegasys/teku/cli/subcommand/TransitionCommand.java
+++ b/teku/src/main/java/tech/pegasys/teku/cli/subcommand/TransitionCommand.java
@@ -78,7 +78,7 @@ public class TransitionCommand implements Runnable {
   public int blocks(
       @Mixin final InAndOutParams params,
       @Parameters(paramLabel = "block", description = "Files to read blocks from (ssz or hex)")
-      final List<String> blockPaths) {
+          final List<String> blockPaths) {
     return processStateTransition(
         params,
         (spec, state) -> {
@@ -116,9 +116,9 @@ public int slots(
               showDefaultValue = Visibility.ALWAYS,
               fallbackValue = "true",
               description = "to interpret the slot number as a delta from the pre-state")
-      final boolean delta,
+          final boolean delta,
       @Parameters(paramLabel = "<number>", description = "Number of slots to process")
-      final long number) {
+          final long number) {
     return processStateTransition(
         params,
         (specProvider, state) -> {
diff --git a/teku/src/main/java/tech/pegasys/teku/cli/subcommand/internal/validator/tools/DepositTransactionSender.java b/teku/src/main/java/tech/pegasys/teku/cli/subcommand/internal/validator/tools/DepositTransactionSender.java
index 1b298c21dbb..d6ee2a8dd6a 100644
--- a/teku/src/main/java/tech/pegasys/teku/cli/subcommand/internal/validator/tools/DepositTransactionSender.java
+++ b/teku/src/main/java/tech/pegasys/teku/cli/subcommand/internal/validator/tools/DepositTransactionSender.java
@@ -59,7 +59,7 @@ public DepositTransactionSender(
   }
 
   public SafeFuture<TransactionReceipt> sendDepositTransaction(
-          final BLSKeyPair validatorKeyPair,
+      final BLSKeyPair validatorKeyPair,
       final BLSPublicKey withdrawalPublicKey,
       final UInt64 amountInGwei,
       final Consumer<String> commandStdOutput,
diff --git a/teku/src/main/java/tech/pegasys/teku/cli/util/EnvironmentVariableParamsProvider.java b/teku/src/main/java/tech/pegasys/teku/cli/util/EnvironmentVariableParamsProvider.java
index 4e080d7a312..9e087c77f0c 100644
--- a/teku/src/main/java/tech/pegasys/teku/cli/util/EnvironmentVariableParamsProvider.java
+++ b/teku/src/main/java/tech/pegasys/teku/cli/util/EnvironmentVariableParamsProvider.java
@@ -64,7 +64,7 @@ protected Optional<Entry<String, String>> translateEntry(
 
   @Override
   protected Map.Entry<String, String> translateToArg(
-          final OptionSpec matchedOption, final Map.Entry<String, String> envEntry) {
+      final OptionSpec matchedOption, final Map.Entry<String, String> envEntry) {
     return Map.entry(matchedOption.longestName(), envEntry.getValue());
   }
 }
diff --git a/teku/src/main/java/tech/pegasys/teku/cli/util/YamlConfigFileParamsProvider.java b/teku/src/main/java/tech/pegasys/teku/cli/util/YamlConfigFileParamsProvider.java
index 41c28f1969d..80718a29fb1 100644
--- a/teku/src/main/java/tech/pegasys/teku/cli/util/YamlConfigFileParamsProvider.java
+++ b/teku/src/main/java/tech/pegasys/teku/cli/util/YamlConfigFileParamsProvider.java
@@ -85,7 +85,7 @@ protected Optional<Entry<String, Object>> translateEntry(
 
   @Override
   protected Map.Entry<String, String> translateToArg(
-          final  OptionSpec matchedOption, final  Map.Entry<String, Object> yamlEntry) {
+      final OptionSpec matchedOption, final Map.Entry<String, Object> yamlEntry) {
     final Object value = yamlEntry.getValue();
 
     final String translatedValue;
diff --git a/teku/src/main/java/tech/pegasys/teku/config/TekuConfiguration.java b/teku/src/main/java/tech/pegasys/teku/config/TekuConfiguration.java
index 63082082a54..e42efc56ec1 100644
--- a/teku/src/main/java/tech/pegasys/teku/config/TekuConfiguration.java
+++ b/teku/src/main/java/tech/pegasys/teku/config/TekuConfiguration.java
@@ -386,7 +386,7 @@ public Builder store(final Consumer<StoreConfig.Builder> storeConfigBuilderConsu
     }
 
     public Builder beaconChainControllerFactory(
-            final BeaconChainControllerFactory beaconChainControllerFactory) {
+        final BeaconChainControllerFactory beaconChainControllerFactory) {
       this.beaconChainControllerFactory = beaconChainControllerFactory;
       return this;
     }