diff --git a/src/main/java/com/example/kickevent/controller/CommentController.java b/src/main/java/com/example/kickevent/controller/CommentController.java
index cab3ac5..99dbbc6 100644
--- a/src/main/java/com/example/kickevent/controller/CommentController.java
+++ b/src/main/java/com/example/kickevent/controller/CommentController.java
@@ -1,10 +1,7 @@
 package com.example.kickevent.controller;
 
 import com.example.kickevent.model.Comment;
-import com.example.kickevent.repositories.CommentRepository;
-import com.example.kickevent.repositories.EventRepository;
 import com.example.kickevent.services.CommentService;
-import com.example.kickevent.services.EventService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,14 +9,10 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestWrapper;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 
 @CrossOrigin(origins = "*", allowedHeaders = "*")
diff --git a/src/main/java/com/example/kickevent/controller/EventController.java b/src/main/java/com/example/kickevent/controller/EventController.java
index 9089cc4..6e20a48 100644
--- a/src/main/java/com/example/kickevent/controller/EventController.java
+++ b/src/main/java/com/example/kickevent/controller/EventController.java
@@ -11,7 +11,6 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 
-
 import java.util.List;
 
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
diff --git a/src/main/java/com/example/kickevent/controller/JwtAuthenticationController.java b/src/main/java/com/example/kickevent/controller/JwtAuthenticationController.java
index f284ad8..e40c553 100644
--- a/src/main/java/com/example/kickevent/controller/JwtAuthenticationController.java
+++ b/src/main/java/com/example/kickevent/controller/JwtAuthenticationController.java
@@ -1,8 +1,8 @@
 package com.example.kickevent.controller;
 
-import com.example.kickevent.model.*;
 import com.example.kickevent.exceptions.TokenRefreshException;
-import com.example.kickevent.security.*;
+import com.example.kickevent.model.*;
+import com.example.kickevent.security.JwtTokenUtil;
 import com.example.kickevent.services.RefreshTokenService;
 import com.example.kickevent.services.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,13 +11,11 @@
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.List;
-import java.util.logging.Logger;
 
 @RestController
 @CrossOrigin(origins = "*", allowedHeaders = "*")
diff --git a/src/main/java/com/example/kickevent/controller/UserController.java b/src/main/java/com/example/kickevent/controller/UserController.java
index 4bbfb1c..fd2a6d0 100644
--- a/src/main/java/com/example/kickevent/controller/UserController.java
+++ b/src/main/java/com/example/kickevent/controller/UserController.java
@@ -1,7 +1,7 @@
 package com.example.kickevent.controller;
 
-import com.example.kickevent.model.User;
 import com.example.kickevent.exceptions.UserNotFoundException;
+import com.example.kickevent.model.User;
 import com.example.kickevent.services.UserService;
 import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.server.mvc.WebMvcLinkBuilder;
diff --git a/src/main/java/com/example/kickevent/exceptions/EventNotFoundAdvice.java b/src/main/java/com/example/kickevent/exceptions/EventNotFoundAdvice.java
index 252476d..d08ba03 100644
--- a/src/main/java/com/example/kickevent/exceptions/EventNotFoundAdvice.java
+++ b/src/main/java/com/example/kickevent/exceptions/EventNotFoundAdvice.java
@@ -1,7 +1,10 @@
 package com.example.kickevent.exceptions;
 
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 @RestControllerAdvice
 public class EventNotFoundAdvice {
diff --git a/src/main/java/com/example/kickevent/exceptions/JwtTokenExpiredAdvice.java b/src/main/java/com/example/kickevent/exceptions/JwtTokenExpiredAdvice.java
index 2f3d0cf..b94a169 100644
--- a/src/main/java/com/example/kickevent/exceptions/JwtTokenExpiredAdvice.java
+++ b/src/main/java/com/example/kickevent/exceptions/JwtTokenExpiredAdvice.java
@@ -1,6 +1,5 @@
 package com.example.kickevent.exceptions;
 
-import org.apache.coyote.Response;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/com/example/kickevent/exceptions/UserNotFoundAdvice.java b/src/main/java/com/example/kickevent/exceptions/UserNotFoundAdvice.java
index 8d6232d..7f7585c 100644
--- a/src/main/java/com/example/kickevent/exceptions/UserNotFoundAdvice.java
+++ b/src/main/java/com/example/kickevent/exceptions/UserNotFoundAdvice.java
@@ -1,7 +1,10 @@
 package com.example.kickevent.exceptions;
 
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 @RestControllerAdvice
 public class UserNotFoundAdvice {
diff --git a/src/main/java/com/example/kickevent/exceptions/UsernameAlreadyTakenAdvice.java b/src/main/java/com/example/kickevent/exceptions/UsernameAlreadyTakenAdvice.java
index fc9e4d6..73cebca 100644
--- a/src/main/java/com/example/kickevent/exceptions/UsernameAlreadyTakenAdvice.java
+++ b/src/main/java/com/example/kickevent/exceptions/UsernameAlreadyTakenAdvice.java
@@ -1,7 +1,10 @@
 package com.example.kickevent.exceptions;
 
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 @RestControllerAdvice
 public class UsernameAlreadyTakenAdvice {
diff --git a/src/main/java/com/example/kickevent/model/Comment.java b/src/main/java/com/example/kickevent/model/Comment.java
index 7053d6f..6c5a125 100644
--- a/src/main/java/com/example/kickevent/model/Comment.java
+++ b/src/main/java/com/example/kickevent/model/Comment.java
@@ -1,6 +1,5 @@
 package com.example.kickevent.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.*;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
diff --git a/src/main/java/com/example/kickevent/model/Event.java b/src/main/java/com/example/kickevent/model/Event.java
index f69e024..8dcd595 100644
--- a/src/main/java/com/example/kickevent/model/Event.java
+++ b/src/main/java/com/example/kickevent/model/Event.java
@@ -1,14 +1,12 @@
 
 package com.example.kickevent.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.*;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
 import javax.persistence.*;
 import java.util.Date;
-import java.util.List;
 
 @Entity
 @Data
diff --git a/src/main/java/com/example/kickevent/model/User.java b/src/main/java/com/example/kickevent/model/User.java
index d4ad1fd..687e036 100644
--- a/src/main/java/com/example/kickevent/model/User.java
+++ b/src/main/java/com/example/kickevent/model/User.java
@@ -1,13 +1,11 @@
 package com.example.kickevent.model;
 
 
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
 
 import javax.persistence.*;
 import java.util.ArrayList;
-
 import java.util.List;
 
 
diff --git a/src/main/java/com/example/kickevent/repositories/EventRepository.java b/src/main/java/com/example/kickevent/repositories/EventRepository.java
index e60be88..fd917ee 100644
--- a/src/main/java/com/example/kickevent/repositories/EventRepository.java
+++ b/src/main/java/com/example/kickevent/repositories/EventRepository.java
@@ -3,7 +3,6 @@
 import com.example.kickevent.model.Event;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
 import java.util.Optional;
 
 public interface EventRepository extends JpaRepository<Event,Long> {
diff --git a/src/main/java/com/example/kickevent/repositories/UserRepository.java b/src/main/java/com/example/kickevent/repositories/UserRepository.java
index 473987d..e182b17 100644
--- a/src/main/java/com/example/kickevent/repositories/UserRepository.java
+++ b/src/main/java/com/example/kickevent/repositories/UserRepository.java
@@ -3,7 +3,6 @@
 import com.example.kickevent.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-
 import java.util.List;
 import java.util.Optional;
 /*
diff --git a/src/main/java/com/example/kickevent/security/JwtRequestFilter.java b/src/main/java/com/example/kickevent/security/JwtRequestFilter.java
index 255f4f7..33ea5ca 100644
--- a/src/main/java/com/example/kickevent/security/JwtRequestFilter.java
+++ b/src/main/java/com/example/kickevent/security/JwtRequestFilter.java
@@ -3,7 +3,6 @@
 import com.example.kickevent.exceptions.JwtTokenExpiredException;
 import com.example.kickevent.services.UserService;
 import io.jsonwebtoken.ExpiredJwtException;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/src/main/java/com/example/kickevent/services/CommentService.java b/src/main/java/com/example/kickevent/services/CommentService.java
index 43e4d03..f6f8dd3 100644
--- a/src/main/java/com/example/kickevent/services/CommentService.java
+++ b/src/main/java/com/example/kickevent/services/CommentService.java
@@ -2,15 +2,10 @@
 
 import com.example.kickevent.model.Comment;
 import com.example.kickevent.repositories.CommentRepository;
-import com.example.kickevent.repositories.EventRepository;
 import com.example.kickevent.repositories.UserRepository;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.*;
 
 import java.time.Instant;
 import java.util.Date;
diff --git a/src/main/java/com/example/kickevent/services/EventService.java b/src/main/java/com/example/kickevent/services/EventService.java
index 638c880..598743f 100644
--- a/src/main/java/com/example/kickevent/services/EventService.java
+++ b/src/main/java/com/example/kickevent/services/EventService.java
@@ -1,7 +1,6 @@
 package com.example.kickevent.services;
 
 import com.example.kickevent.model.Event;
-import com.example.kickevent.model.User;
 import com.example.kickevent.repositories.EventRepository;
 import com.example.kickevent.repositories.UserRepository;
 import org.slf4j.Logger;
@@ -11,11 +10,9 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 
-import java.security.Principal;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 @Service
diff --git a/src/main/java/com/example/kickevent/services/RefreshTokenService.java b/src/main/java/com/example/kickevent/services/RefreshTokenService.java
index 81bb733..fb5de28 100644
--- a/src/main/java/com/example/kickevent/services/RefreshTokenService.java
+++ b/src/main/java/com/example/kickevent/services/RefreshTokenService.java
@@ -1,10 +1,10 @@
 package com.example.kickevent.services;
 
 
+import com.example.kickevent.exceptions.TokenRefreshException;
 import com.example.kickevent.model.RefreshToken;
 import com.example.kickevent.repositories.RefreshTokenRepository;
 import com.example.kickevent.repositories.UserRepository;
-import com.example.kickevent.exceptions.TokenRefreshException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/example/kickevent/services/UserService.java b/src/main/java/com/example/kickevent/services/UserService.java
index 4ffeee5..cc1c1f4 100644
--- a/src/main/java/com/example/kickevent/services/UserService.java
+++ b/src/main/java/com/example/kickevent/services/UserService.java
@@ -1,12 +1,11 @@
 package com.example.kickevent.services;
 
+import com.example.kickevent.exceptions.UsernameAlreadyTakenException;
 import com.example.kickevent.model.Role;
 import com.example.kickevent.model.User;
-import com.example.kickevent.exceptions.UsernameAlreadyTakenException;
 import com.example.kickevent.repositories.RefreshTokenRepository;
 import com.example.kickevent.repositories.RoleRepository;
 import com.example.kickevent.repositories.UserRepository;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,10 +18,11 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-;
 import java.util.*;
 import java.util.stream.Collectors;
 
+;
+
 @Service
 public class UserService implements UserDetailsService {