diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/DeleteSshKey.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/DeleteSshKey.java
index 3257c02..691f33f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/DeleteSshKey.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/DeleteSshKey.java
@@ -37,7 +37,10 @@
 
   @Override
   public Response<?> apply(ServiceUserResource.SshKey rsrc, Input input)
-      throws AuthException, RepositoryNotFoundException, IOException, ConfigInvalidException,
+      throws AuthException,
+          RepositoryNotFoundException,
+          IOException,
+          ConfigInvalidException,
           PermissionBackendException {
     return deleteSshKey.get().apply(rsrc.getUser(), rsrc.getSshKey());
   }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutEmail.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutEmail.java
index 0fb9269..cb66be7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutEmail.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutEmail.java
@@ -73,7 +73,10 @@
 
   @Override
   public Response<?> apply(ServiceUserResource rsrc, Input input)
-      throws ConfigInvalidException, EmailException, IOException, PermissionBackendException,
+      throws ConfigInvalidException,
+          EmailException,
+          IOException,
+          PermissionBackendException,
           RestApiException {
     Boolean emailAllowed;
     try {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutName.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutName.java
index 8b10d59..2906daa 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutName.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/PutName.java
@@ -36,7 +36,9 @@
 
   @Override
   public Response<String> apply(ServiceUserResource rsrc, NameInput input)
-      throws MethodNotAllowedException, ResourceNotFoundException, IOException,
+      throws MethodNotAllowedException,
+          ResourceNotFoundException,
+          IOException,
           ConfigInvalidException {
     return putName.get().apply(rsrc.getUser(), input);
   }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ServiceUserCollection.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ServiceUserCollection.java
index f6f50ac..d2a505e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ServiceUserCollection.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/ServiceUserCollection.java
@@ -74,8 +74,12 @@
 
   @Override
   public ServiceUserResource parse(ConfigResource parent, IdString id)
-      throws ResourceNotFoundException, AuthException, IOException, PermissionBackendException,
-          ConfigInvalidException, RestApiException {
+      throws ResourceNotFoundException,
+          AuthException,
+          IOException,
+          PermissionBackendException,
+          ConfigInvalidException,
+          RestApiException {
     IdentifiedUser serviceUser = accounts.get().parse(TopLevelResource.INSTANCE, id).getUser();
     Config db = storageCache.get();
     if (serviceUser == null || !db.getSubsections(USER).contains(serviceUser.getUserName().get())) {
