diff --git a/Server/src/main/java/uulm/teamname/marvelous/server/Server.java b/Server/src/main/java/uulm/teamname/marvelous/server/Server.java
index 54490b2..75f8930 100644
--- a/Server/src/main/java/uulm/teamname/marvelous/server/Server.java
+++ b/Server/src/main/java/uulm/teamname/marvelous/server/Server.java
@@ -92,7 +92,6 @@ public class Server {
      * It has to be executed <b>BEFORE ANY LOGGING OPERATIONS</b> .
      */
     private static void setLogLevel(int logLevel) {
-        // System.out.println("setting log level to " + logLevel);
         Map<String, String> map = new HashMap<>();
 
         Configuration.replace(map);
diff --git a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/LifetimeTimer.java b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/LifetimeTimer.java
index ff47751..c6d2317 100644
--- a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/LifetimeTimer.java
+++ b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/LifetimeTimer.java
@@ -1,13 +1,9 @@
 package uulm.teamname.marvelous.server.lobby;
 
-import uulm.teamname.marvelous.server.Server;
-import uulm.teamname.marvelous.server.lobbymanager.Participant;
-
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 
 /**
  * A timer meant to time the entire Lifetime of the lobby, and if it is higher than the maximum permitted value,
diff --git a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/TurnTimeoutTimer.java b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/TurnTimeoutTimer.java
index 9e39aa5..39f6f3e 100644
--- a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/TurnTimeoutTimer.java
+++ b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/TurnTimeoutTimer.java
@@ -28,19 +28,19 @@ public class TurnTimeoutTimer {
     /**
      * This method checks if the participant is not a spectator. Otherwise it won't start a timer.
      *
-     * @param Participant the timer is for
+     * @param participant the timer is for
      */
-    public void startTurnTimer(Participant Participant) {
-        if (Participant.type == ParticipantType.Spectator) {
+    public void startTurnTimer(Participant participant) {
+        if (participant.type == ParticipantType.Spectator) {
             throw new IllegalStateException("Spectators don't have TurnTime");
         }
 
         clear();
         Logger.debug("Starting turn timer for participant '{}' with role {}",
-                Participant.id.getName(), Participant.type);
+                participant.id.getName(), participant.type);
         current = timer.schedule(() -> {
-                    callback.accept(Participant);
-                    return Participant;
+                    callback.accept(participant);
+                    return participant;
                 },
                 maxRoundTime,
                 TimeUnit.SECONDS);
diff --git a/Server/src/main/java/uulm/teamname/marvelous/server/lobbymanager/LobbyConnection.java b/Server/src/main/java/uulm/teamname/marvelous/server/lobbymanager/LobbyConnection.java
index 8b19cf3..3ef64a8 100644
--- a/Server/src/main/java/uulm/teamname/marvelous/server/lobbymanager/LobbyConnection.java
+++ b/Server/src/main/java/uulm/teamname/marvelous/server/lobbymanager/LobbyConnection.java
@@ -29,9 +29,9 @@ public class LobbyConnection implements Runnable {
     private Participant player1;
     private Participant player2;
 
-    private final HashSet<Participant> spectators = new HashSet<>(10);
-    private final HashMap<SUID, List<Integer>> selection = new HashMap<>(2);
-    public final HashMap<ParticipantType, CharacterProperties[]> options = new HashMap<>(2);
+    private final Set<Participant> spectators = new HashSet<>(10);
+    private final Map<SUID, List<Integer>> selection = new HashMap<>(2);
+    public final Map<ParticipantType, CharacterProperties[]> options = new HashMap<>(2);
 
     private final BlockingQueue<Tuple<Participant, Request[]>> requestQueue = new LinkedBlockingQueue<>();
 
@@ -117,7 +117,7 @@ public class LobbyConnection implements Runnable {
         return player2;
     }
 
-    public HashSet<Participant> getSpectators() {
+    public Set<Participant> getSpectators() {
         return spectators;
     }
 
diff --git a/Server/src/test/java/uulm/teamname/marvelous/server/netconnector/UserManagerTest.java b/Server/src/test/java/uulm/teamname/marvelous/server/netconnector/UserManagerTest.java
index 24e49f3..98fd48a 100644
--- a/Server/src/test/java/uulm/teamname/marvelous/server/netconnector/UserManagerTest.java
+++ b/Server/src/test/java/uulm/teamname/marvelous/server/netconnector/UserManagerTest.java
@@ -43,7 +43,7 @@ class UserManagerTest {
 
     @Test
     void userIsConnectedTest() {
-        assertThat(manager.getUserCount()).isEqualTo(0);
+        assertThat(manager.getUserCount()).isZero();
         assertThat(manager.containsConnection(socket1)).isFalse();
         manager.connectUser(socket1);
         assertThat(manager.getUserCount()).isEqualTo(1);