diff --git a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/ApiKeyController.java b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/ApiKeyController.java
index 5204911c0..b5364f0f4 100644
--- a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/ApiKeyController.java
+++ b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/ApiKeyController.java
@@ -1,20 +1,19 @@
 package it.chalmers.gamma.adapter.primary.web;
 
+import static it.chalmers.gamma.adapter.primary.web.WebValidationHelper.validateObject;
+import static it.chalmers.gamma.app.common.UUIDValidator.isValidUUID;
+
 import it.chalmers.gamma.app.apikey.ApiKeyFacade;
 import it.chalmers.gamma.app.apikey.ApiKeySettingsFacade;
 import it.chalmers.gamma.app.common.PrettyName.PrettyNameValidator;
 import it.chalmers.gamma.app.supergroup.SuperGroupFacade;
 import jakarta.servlet.http.HttpServletResponse;
+import java.util.*;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.*;
-
-import static it.chalmers.gamma.adapter.primary.web.WebValidationHelper.validateObject;
-import static it.chalmers.gamma.app.common.UUIDValidator.isValidUUID;
-
 @Controller
 public class ApiKeyController {
 
diff --git a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/ClientsController.java b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/ClientsController.java
index 8ccf642d7..cad076830 100644
--- a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/ClientsController.java
+++ b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/ClientsController.java
@@ -1,5 +1,8 @@
 package it.chalmers.gamma.adapter.primary.web;
 
+import static it.chalmers.gamma.adapter.primary.web.WebValidationHelper.validateObject;
+import static it.chalmers.gamma.app.common.UUIDValidator.isValidUUID;
+
 import it.chalmers.gamma.app.client.ClientApprovalFacade;
 import it.chalmers.gamma.app.client.ClientAuthorityFacade;
 import it.chalmers.gamma.app.client.ClientFacade;
@@ -12,17 +15,13 @@
 import it.chalmers.gamma.security.authentication.AuthenticationExtractor;
 import it.chalmers.gamma.security.authentication.UserAuthentication;
 import jakarta.servlet.http.HttpServletResponse;
+import java.util.*;
+import java.util.stream.Collectors;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static it.chalmers.gamma.adapter.primary.web.WebValidationHelper.validateObject;
-import static it.chalmers.gamma.app.common.UUIDValidator.isValidUUID;
-
 @Controller
 public class ClientsController {
 
diff --git a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/GroupsController.java b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/GroupsController.java
index fc7fce3ba..94f7665e3 100644
--- a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/GroupsController.java
+++ b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/GroupsController.java
@@ -1,5 +1,8 @@
 package it.chalmers.gamma.adapter.primary.web;
 
+import static it.chalmers.gamma.adapter.primary.web.WebValidationHelper.validateObject;
+import static it.chalmers.gamma.app.common.UUIDValidator.isValidUUID;
+
 import it.chalmers.gamma.app.common.PrettyName.PrettyNameValidator;
 import it.chalmers.gamma.app.group.GroupFacade;
 import it.chalmers.gamma.app.post.PostFacade;
@@ -7,6 +10,8 @@
 import it.chalmers.gamma.app.user.UserFacade;
 import it.chalmers.gamma.app.user.domain.Name.NameValidator;
 import jakarta.servlet.http.HttpServletResponse;
+import java.util.*;
+import java.util.stream.Collectors;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
@@ -15,12 +20,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static it.chalmers.gamma.adapter.primary.web.WebValidationHelper.validateObject;
-import static it.chalmers.gamma.app.common.UUIDValidator.isValidUUID;
-
 @Controller
 public class GroupsController {
 
@@ -436,7 +435,8 @@ public ModelAndView getNewMember(
     return mv;
   }
 
-  public ModelAndView createGetCreateGroup(boolean htmxRequest, GroupForm form, BindingResult bindingResult) {
+  public ModelAndView createGetCreateGroup(
+      boolean htmxRequest, GroupForm form, BindingResult bindingResult) {
     ModelAndView mv = new ModelAndView();
 
     if (htmxRequest) {
diff --git a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/RegisterAccountController.java b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/RegisterAccountController.java
index 47800e15c..8fbde1924 100644
--- a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/RegisterAccountController.java
+++ b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/RegisterAccountController.java
@@ -1,5 +1,7 @@
 package it.chalmers.gamma.adapter.primary.web;
 
+import static it.chalmers.gamma.adapter.primary.web.WebValidationHelper.validateObject;
+
 import it.chalmers.gamma.app.common.Email.EmailValidator;
 import it.chalmers.gamma.app.user.UserCreationFacade;
 import it.chalmers.gamma.app.user.activation.domain.UserActivationRepository;
@@ -9,6 +11,7 @@
 import it.chalmers.gamma.app.user.domain.LastName.LastNameValidator;
 import it.chalmers.gamma.app.user.domain.Nick.NickValidator;
 import it.chalmers.gamma.app.user.domain.UnencryptedPassword.UnencryptedPasswordValidator;
+import java.time.Year;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -20,10 +23,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.time.Year;
-
-import static it.chalmers.gamma.adapter.primary.web.WebValidationHelper.validateObject;
-
 @Controller
 public class RegisterAccountController {
 
diff --git a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/SuperGroupsController.java b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/SuperGroupsController.java
index 8022f2874..6cb775186 100644
--- a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/SuperGroupsController.java
+++ b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/SuperGroupsController.java
@@ -1,24 +1,23 @@
 package it.chalmers.gamma.adapter.primary.web;
 
+import static it.chalmers.gamma.adapter.primary.web.WebValidationHelper.validateObject;
+import static it.chalmers.gamma.app.common.UUIDValidator.isValidUUID;
+
 import it.chalmers.gamma.app.common.PrettyName.PrettyNameValidator;
 import it.chalmers.gamma.app.group.GroupFacade;
 import it.chalmers.gamma.app.supergroup.SuperGroupFacade;
 import it.chalmers.gamma.app.supergroup.domain.SuperGroupRepository;
 import it.chalmers.gamma.app.user.domain.Name.NameValidator;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-import static it.chalmers.gamma.adapter.primary.web.WebValidationHelper.validateObject;
-import static it.chalmers.gamma.app.common.UUIDValidator.isValidUUID;
-
 @Controller
 public class SuperGroupsController {
 
diff --git a/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/user/UserActivationRepositoryAdapter.java b/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/user/UserActivationRepositoryAdapter.java
index 6fd22ca37..6d14d4e60 100644
--- a/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/user/UserActivationRepositoryAdapter.java
+++ b/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/user/UserActivationRepositoryAdapter.java
@@ -7,13 +7,12 @@
 import it.chalmers.gamma.app.user.activation.domain.UserActivationToken;
 import it.chalmers.gamma.app.user.domain.Cid;
 import jakarta.transaction.Transactional;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.stereotype.Service;
-
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.stereotype.Service;
 
 @Service
 public class UserActivationRepositoryAdapter implements UserActivationRepository {
@@ -57,11 +56,12 @@ public List<UserActivation> getAll() {
         .toList();
   }
 
-
-
   @Override
   public boolean isTokenValid(UserActivationToken token) {
-    return this.userActivationJpaRepository.findByToken(token.value()).map(this::isStillValid).orElse(false);
+    return this.userActivationJpaRepository
+        .findByToken(token.value())
+        .map(this::isStillValid)
+        .orElse(false);
   }
 
   @Override
diff --git a/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/user/UserPasswordResetRepositoryAdapter.java b/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/user/UserPasswordResetRepositoryAdapter.java
index 2890052a3..3aea32284 100644
--- a/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/user/UserPasswordResetRepositoryAdapter.java
+++ b/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/user/UserPasswordResetRepositoryAdapter.java
@@ -6,11 +6,10 @@
 import it.chalmers.gamma.app.user.passwordreset.domain.PasswordResetRepository;
 import it.chalmers.gamma.app.user.passwordreset.domain.PasswordResetToken;
 import jakarta.transaction.Transactional;
-import org.springframework.stereotype.Service;
-
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Optional;
+import org.springframework.stereotype.Service;
 
 @Service("PasswordResetRepository")
 @Transactional
@@ -65,7 +64,10 @@ public PasswordReset createNewToken(Cid cid) throws UserNotFoundException {
 
   @Override
   public boolean isTokenValid(PasswordResetToken token) {
-    return this.userPasswordResetJpaRepository.findByToken(token.value()).map(this::isStillValid).orElse(false);
+    return this.userPasswordResetJpaRepository
+        .findByToken(token.value())
+        .map(this::isStillValid)
+        .orElse(false);
   }
 
   @Override
@@ -91,5 +93,4 @@ public boolean isStillValid(UserPasswordResetEntity userPasswordResetEntity) {
     Instant createdAt = userPasswordResetEntity.toDomain().createdAt();
     return Duration.between(createdAt, Instant.now()).toMinutes() < 15;
   }
-
 }