diff --git a/java/google/registry/model/domain/fee12/package-info.java b/java/google/registry/model/domain/fee12/package-info.java
index 6a2184deb..6735cf53b 100644
--- a/java/google/registry/model/domain/fee12/package-info.java
+++ b/java/google/registry/model/domain/fee12/package-info.java
@@ -31,3 +31,4 @@ import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlSchema;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
+
diff --git a/java/google/registry/model/domain/flags/package-info.java b/java/google/registry/model/domain/flags/package-info.java
index 328b8eaca..f66a0103a 100644
--- a/java/google/registry/model/domain/flags/package-info.java
+++ b/java/google/registry/model/domain/flags/package-info.java
@@ -24,3 +24,4 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlSchema;
+
diff --git a/java/google/registry/tools/CreateLrpTokensCommand.java b/java/google/registry/tools/CreateLrpTokensCommand.java
index db80e9831..de7b944d1 100644
--- a/java/google/registry/tools/CreateLrpTokensCommand.java
+++ b/java/google/registry/tools/CreateLrpTokensCommand.java
@@ -23,27 +23,22 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-
 import com.google.common.base.Function;
 import com.google.common.base.Splitter;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Files;
 import com.google.common.io.LineReader;
-
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Work;
-
 import google.registry.model.domain.LrpToken;
 import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import google.registry.tools.params.PathParameter;
-
 import java.io.StringReader;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Set;
-
 import javax.inject.Inject;
 
 /**
diff --git a/java/google/registry/tools/RegistryToolModule.java b/java/google/registry/tools/RegistryToolModule.java
index ebfd7224a..e8eb4cff9 100644
--- a/java/google/registry/tools/RegistryToolModule.java
+++ b/java/google/registry/tools/RegistryToolModule.java
@@ -21,7 +21,6 @@ import java.security.NoSuchAlgorithmException;
 import java.security.ProviderException;
 import java.security.SecureRandom;
 import java.util.Random;
-
 import javax.inject.Named;
 
 /** Dagger module for Registry Tool. */
diff --git a/java/google/registry/tools/StringGenerator.java b/java/google/registry/tools/StringGenerator.java
index dbbb06fc7..c67cab3e2 100644
--- a/java/google/registry/tools/StringGenerator.java
+++ b/java/google/registry/tools/StringGenerator.java
@@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
 
 import com.google.common.collect.ImmutableList;
-
 import java.util.Collection;
 
 /** String generator. */
diff --git a/java/google/registry/tools/UpdateTldCommand.java b/java/google/registry/tools/UpdateTldCommand.java
index e01cc0834..ebb10af24 100644
--- a/java/google/registry/tools/UpdateTldCommand.java
+++ b/java/google/registry/tools/UpdateTldCommand.java
@@ -33,13 +33,12 @@ import google.registry.config.RegistryEnvironment;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldState;
 import google.registry.model.registry.label.ReservedList;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
 
 /** Command to update a TLD. */
 @Parameters(separators = " =", commandDescription = "Update existing TLD(s)")
diff --git a/javatests/google/registry/tools/CreateLrpTokensCommandTest.java b/javatests/google/registry/tools/CreateLrpTokensCommandTest.java
index d12173878..f83a7fa3d 100644
--- a/javatests/google/registry/tools/CreateLrpTokensCommandTest.java
+++ b/javatests/google/registry/tools/CreateLrpTokensCommandTest.java
@@ -23,19 +23,14 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Files;
-
 import com.googlecode.objectify.Key;
-
 import google.registry.model.domain.LrpToken;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.tools.DeterministicStringGenerator.Rule;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.Set;
-
 import javax.annotation.Nullable;
-
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/javatests/google/registry/tools/DeterministicStringGenerator.java b/javatests/google/registry/tools/DeterministicStringGenerator.java
index 708b635cb..5911a21cb 100644
--- a/javatests/google/registry/tools/DeterministicStringGenerator.java
+++ b/javatests/google/registry/tools/DeterministicStringGenerator.java
@@ -19,7 +19,6 @@ import static com.google.common.collect.Lists.charactersOf;
 
 import com.google.common.collect.Iterators;
 import java.util.Iterator;
-
 import javax.inject.Named;
 
 /**