diff --git a/java/google/registry/backup/RestoreCommitLogsAction.java b/java/google/registry/backup/RestoreCommitLogsAction.java
index ba9456e08..5a7615bd3 100644
--- a/java/google/registry/backup/RestoreCommitLogsAction.java
+++ b/java/google/registry/backup/RestoreCommitLogsAction.java
@@ -84,7 +84,7 @@ public class RestoreCommitLogsAction implements Runnable {
 
   @Override
   public void run() {
-    checkArgument( // safety
+    checkArgument(
         RegistryEnvironment.get() == RegistryEnvironment.ALPHA
             || RegistryEnvironment.get() == RegistryEnvironment.CRASH
             || RegistryEnvironment.get() == RegistryEnvironment.UNITTEST,
diff --git a/java/google/registry/keyring/KeyringModule.java b/java/google/registry/keyring/KeyringModule.java
index 28c525900..089af7802 100644
--- a/java/google/registry/keyring/KeyringModule.java
+++ b/java/google/registry/keyring/KeyringModule.java
@@ -14,8 +14,8 @@
 
 package google.registry.keyring;
 
-
 import static com.google.common.base.Preconditions.checkState;
+
 import dagger.Module;
 import dagger.Provides;
 import google.registry.config.RegistryConfig.Config;
diff --git a/java/google/registry/request/auth/RequestAuthenticator.java b/java/google/registry/request/auth/RequestAuthenticator.java
index 4d1f8c72e..747777b07 100644
--- a/java/google/registry/request/auth/RequestAuthenticator.java
+++ b/java/google/registry/request/auth/RequestAuthenticator.java
@@ -160,9 +160,8 @@ public class RequestAuthenticator {
     for (AuthMethod authMethod : auth.methods()) {
       switch (authMethod) {
         // App Engine internal authentication, using the queue name header
-        case INTERNAL:
-          // checkAuthConfig will have insured that the user policy is not USER.
-          {
+        case INTERNAL: {
+            // checkAuthConfig will have insured that the user policy is not USER.
             AuthResult authResult = appEngineInternalAuthenticationMechanism.authenticate(req);
             if (authResult.isAuthenticated()) {
               logger.atInfo().log("Authenticated via internal auth: %s", authResult);
diff --git a/java/google/registry/tools/RegistrarContactCommand.java b/java/google/registry/tools/RegistrarContactCommand.java
index 411d1bf10..9ffcc24a8 100644
--- a/java/google/registry/tools/RegistrarContactCommand.java
+++ b/java/google/registry/tools/RegistrarContactCommand.java
@@ -185,7 +185,7 @@ final class RegistrarContactCommand extends MutatingCommand {
       case CREATE:
         stageEntityChange(null, createContact(registrar));
         if ((visibleInDomainWhoisAsAbuse != null) && visibleInDomainWhoisAsAbuse) {
-          unsetOtherWhoisAbuseFlags(contacts, null /* emailAddressNotToChange */ );
+          unsetOtherWhoisAbuseFlags(contacts, null);
         }
         break;
       case UPDATE:
diff --git a/java/google/registry/tools/UpdateServerLocksCommand.java b/java/google/registry/tools/UpdateServerLocksCommand.java
index 945e9b30d..6c00ad297 100644
--- a/java/google/registry/tools/UpdateServerLocksCommand.java
+++ b/java/google/registry/tools/UpdateServerLocksCommand.java
@@ -51,7 +51,7 @@ final class UpdateServerLocksCommand extends MutatingEppToolCommand {
       names = {"-a", "--apply"},
       description = "Comma-delimited set of locks to apply (or 'all'). "
           + "Valid locks: serverDeleteProhibited, serverHold, serverRenewProhibited, "
-          + "serverTransferProhibited, serverUpdateProhibited" )
+          + "serverTransferProhibited, serverUpdateProhibited")
   private List<String> locksToApply = new ArrayList<>();
 
   @Parameter(
diff --git a/java/google/registry/tools/server/KillAllCommitLogsAction.java b/java/google/registry/tools/server/KillAllCommitLogsAction.java
index bb8a8bbaa..e3a8dc4dc 100644
--- a/java/google/registry/tools/server/KillAllCommitLogsAction.java
+++ b/java/google/registry/tools/server/KillAllCommitLogsAction.java
@@ -57,7 +57,7 @@ public class KillAllCommitLogsAction implements Runnable {
 
   @Override
   public void run() {
-    checkArgument( // safety
+    checkArgument(
         RegistryEnvironment.get() == RegistryEnvironment.CRASH
             || RegistryEnvironment.get() == RegistryEnvironment.UNITTEST,
         "DO NOT RUN ANYWHERE ELSE EXCEPT CRASH OR TESTS.");
diff --git a/java/google/registry/tools/server/KillAllEppResourcesAction.java b/java/google/registry/tools/server/KillAllEppResourcesAction.java
index e3483a6e1..b14711e63 100644
--- a/java/google/registry/tools/server/KillAllEppResourcesAction.java
+++ b/java/google/registry/tools/server/KillAllEppResourcesAction.java
@@ -53,7 +53,7 @@ public class KillAllEppResourcesAction implements Runnable {
 
   @Override
   public void run() {
-    checkArgument( // safety
+    checkArgument(
         RegistryEnvironment.get() == RegistryEnvironment.CRASH
             || RegistryEnvironment.get() == RegistryEnvironment.UNITTEST,
         "DO NOT RUN ANYWHERE ELSE EXCEPT CRASH OR TESTS.");
diff --git a/javatests/google/registry/testing/CertificateSamples.java b/javatests/google/registry/testing/CertificateSamples.java
index a0043b2db..01ede93c6 100644
--- a/javatests/google/registry/testing/CertificateSamples.java
+++ b/javatests/google/registry/testing/CertificateSamples.java
@@ -17,7 +17,11 @@ package google.registry.testing;
 /** Utility methods for tests that involve certificates. */
 public final class CertificateSamples {
 
-  // openssl req -new -nodes -x509 -days 10000 -newkey rsa:2048 -keyout client1.key -out client1.crt -subj "/C=US/ST=New York/L=New York/O=Google/OU=domain-registry-test/CN=client1"
+
+  /*
+   * openssl req -new -nodes -x509 -days 10000 -newkey rsa:2048 -keyout client1.key -out client1.crt
+   * -subj "/C=US/ST=New York/L=New York/O=Google/OU=domain-registry-test/CN=client1"
+   */
   public static final String SAMPLE_CERT = ""
       + "-----BEGIN CERTIFICATE-----\n"
       + "MIIDvTCCAqWgAwIBAgIJAK/PgPT0jTwRMA0GCSqGSIb3DQEBCwUAMHUxCzAJBgNV\n"
@@ -43,10 +47,16 @@ public final class CertificateSamples {
       + "Ug==\n"
       + "-----END CERTIFICATE-----\n";
 
-  // python -c "import sys;print sys.argv[1].decode('hex').encode('base64').strip('\n=')" $(openssl x509 -fingerprint -sha256 -in client1.cert | grep -Po '(?<=Fingerprint=).*' | sed s/://g)
+  /*
+   * python -c "import sys;print sys.argv[1].decode('hex').encode('base64').strip('\n=')" $(openssl
+   * x509 -fingerprint -sha256 -in client1.cert | grep -Po '(?<=Fingerprint=).*' | sed s/://g)
+   */
   public static final String SAMPLE_CERT_HASH = "vue+ZFJC2R7/LedIDQ53NbMoIMSVpqjEJA1CAJVumos";
 
-  // openssl req -new -nodes -x509 -days 10000 -newkey rsa:2048 -keyout client2.key -out client2.crt -subj "/C=US/ST=New York/L=New York/O=Google/OU=domain-registry-test/CN=client2"
+  /*
+   * openssl req -new -nodes -x509 -days 10000 -newkey rsa:2048 -keyout client2.key -out client2.crt
+   * -subj "/C=US/ST=New York/L=New York/O=Google/OU=domain-registry-test/CN=client2"
+   */
   public static final String SAMPLE_CERT2 = ""
       + "-----BEGIN CERTIFICATE-----\n"
       + "MIIDvTCCAqWgAwIBAgIJANoEy6mYwalPMA0GCSqGSIb3DQEBCwUAMHUxCzAJBgNV\n"
@@ -72,7 +82,10 @@ public final class CertificateSamples {
       + "Bg==\n"
       + "-----END CERTIFICATE-----\n";
 
-  // python -c "import sys;print sys.argv[1].decode('hex').encode('base64').strip('\n=')" $(openssl x509 -fingerprint -sha256 -in client2.crt | grep -Po '(?<=Fingerprint=).*' | sed s/://g)
+  /*
+   * python -c "import sys;print sys.argv[1].decode('hex').encode('base64').strip('\n=')" $(openssl
+   * x509 -fingerprint -sha256 -in client2.crt | grep -Po '(?<=Fingerprint=).*' | sed s/://g)
+   */
   public static final String SAMPLE_CERT2_HASH = "GNd6ZP8/n91t9UTnpxR8aH7aAW4+CpvufYx9ViGbcMY";
 
   private CertificateSamples() {}