diff --git a/src/main/java/mops/gruppen2/controller/APIController.java b/src/main/java/mops/gruppen2/controller/APIController.java
index 4fb4e55..d1f6382 100644
--- a/src/main/java/mops/gruppen2/controller/APIController.java
+++ b/src/main/java/mops/gruppen2/controller/APIController.java
@@ -45,7 +45,7 @@ public class APIController {
     @GetMapping("/getGroupIdsOfUser/{teilnehmer}")
     @Secured("ROLE_api_user")
     @ApiOperation("Gibt alle Gruppen zurück in denen sich ein Teilnehmer befindet")
-    public List<Long> getGroupsOfUser(@ApiParam("Teilnehmer dessen groupIds zurückgegeben werden sollen") @PathVariable String teilnehmer) throws EventException {
+    public List<Long> getGroupsOfUser(@ApiParam("Teilnehmer dessen groupIds zurückgegeben werden sollen") @PathVariable String teilnehmer) {
         return eventService.getGroupsOfUser(teilnehmer);
     }
 
@@ -55,7 +55,7 @@ public class APIController {
     public Group getGroupFromId(@ApiParam("GruppenId der gefordeten Gruppe") @PathVariable Long groupId) throws EventException {
         List<Event> eventList = eventService.getEventsOfGroup(groupId);
         List<Group> groups = groupService.projectEventList(eventList);
-        
+
         return groups.get(0);
     }
 
diff --git a/src/main/java/mops/gruppen2/domain/event/Event.java b/src/main/java/mops/gruppen2/domain/event/Event.java
index 703e2aa..798e6f2 100644
--- a/src/main/java/mops/gruppen2/domain/event/Event.java
+++ b/src/main/java/mops/gruppen2/domain/event/Event.java
@@ -10,7 +10,6 @@ import mops.gruppen2.domain.exception.EventException;
 
 
 @JsonTypeInfo(
-        include = JsonTypeInfo.As.PROPERTY,
         use = JsonTypeInfo.Id.NAME,
         property = "type"
 )
diff --git a/src/main/java/mops/gruppen2/repository/EventRepository.java b/src/main/java/mops/gruppen2/repository/EventRepository.java
index aa27fe4..3cd122b 100644
--- a/src/main/java/mops/gruppen2/repository/EventRepository.java
+++ b/src/main/java/mops/gruppen2/repository/EventRepository.java
@@ -24,14 +24,14 @@ public interface EventRepository extends CrudRepository<EventDTO, Long> {
     List<Long> findGroup_idsWhereVisibility(@Param("vis") Boolean visibility);
 
     @Query("SELECT DISTINCT group_id FROM event WHERE event_id > :status")
-    public List<Long> findNewEventSinceStatus(@Param("status") Long status);
+    List<Long> findNewEventSinceStatus(@Param("status") Long status);
 
     @Query("SELECT * FROM event WHERE group_id IN (:groupIds) ")
-    public List<EventDTO> findAllEventsOfGroups(@Param("groupIds") List<Long> groupIds);
+    List<EventDTO> findAllEventsOfGroups(@Param("groupIds") List<Long> groupIds);
 
     @Query("SELECT MAX(event_id) FROM event")
-    public Long getHighesEvent_ID();
+    Long getHighesEvent_ID();
 
     @Query("SELECT MAX(group_id) FROM event")
-    public Long getMaxGroupID();
+    Long getMaxGroupID();
 }
diff --git a/src/test/java/mops/gruppen2/architecture/LayeredArchitectureTest.java b/src/test/java/mops/gruppen2/architecture/LayeredArchitectureTest.java
index 4c1b530..fca3740 100644
--- a/src/test/java/mops/gruppen2/architecture/LayeredArchitectureTest.java
+++ b/src/test/java/mops/gruppen2/architecture/LayeredArchitectureTest.java
@@ -9,7 +9,7 @@ import com.tngtech.archunit.library.Architectures;
 @AnalyzeClasses(packages = "mops.gruppen2", importOptions = ImportOption.DoNotIncludeTests.class)
 public class LayeredArchitectureTest {
 
-    private static Architectures.LayeredArchitecture layeredArchitecture = Architectures
+    private static final Architectures.LayeredArchitecture layeredArchitecture = Architectures
             .layeredArchitecture()
             .layer("Domain").definedBy("..domain..")
             .layer("Service").definedBy("..service")
diff --git a/src/test/java/mops/gruppen2/builder/EventBuilder.java b/src/test/java/mops/gruppen2/builder/EventBuilder.java
index 3440994..fa36457 100644
--- a/src/test/java/mops/gruppen2/builder/EventBuilder.java
+++ b/src/test/java/mops/gruppen2/builder/EventBuilder.java
@@ -24,13 +24,13 @@ public class EventBuilder {
      *
      * @param count       Gruppenanzahl
      * @param membercount Gesamte Mitgliederanzahl
-     * @return
+     * @return Eventliste
      */
     public static List<Event> completeGroups(int count, int membercount) {
         List<Event> eventList = new ArrayList<>();
 
         for (int i = 1; i <= count; i++) {
-            eventList.addAll(EventBuilder.completeGroup(i, membercount / count));
+            eventList.addAll(completeGroup(i, membercount / count));
         }
 
         return eventList;
@@ -39,11 +39,11 @@ public class EventBuilder {
     public static List<Event> completeGroup(long groupId, int membercount) {
         List<Event> eventList = new ArrayList<>();
 
-        eventList.add(EventBuilder.createGroupEvent(groupId));
-        eventList.add(EventBuilder.updateGroupTitleEvent(groupId));
-        eventList.add(EventBuilder.updateGroupDescriptionEvent(groupId));
+        eventList.add(createGroupEvent(groupId));
+        eventList.add(updateGroupTitleEvent(groupId));
+        eventList.add(updateGroupDescriptionEvent(groupId));
 
-        eventList.addAll(EventBuilder.addUserEvents(membercount, groupId));
+        eventList.addAll(addUserEvents(membercount, groupId));
 
         return eventList;
     }
@@ -102,7 +102,7 @@ public class EventBuilder {
         List<Event> eventList = new ArrayList<>();
 
         for (int i = 1; i <= count; i++) {
-            eventList.add(EventBuilder.addUserEvent(groupId, "" + i));
+            eventList.add(addUserEvent(groupId, String.valueOf(i)));
         }
 
         return eventList;
@@ -125,7 +125,7 @@ public class EventBuilder {
         List<DeleteUserEvent> eventList = new ArrayList<>();
 
         for (User user : group.getMembers()) {
-            eventList.add(EventBuilder.deleteUserEvent(group.getId(), user.getId()));
+            eventList.add(deleteUserEvent(group.getId(), user.getId()));
         }
 
         return eventList;
diff --git a/src/test/java/mops/gruppen2/service/EventServiceTest.java b/src/test/java/mops/gruppen2/service/EventServiceTest.java
index 7285360..bdec85f 100644
--- a/src/test/java/mops/gruppen2/service/EventServiceTest.java
+++ b/src/test/java/mops/gruppen2/service/EventServiceTest.java
@@ -15,6 +15,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -56,14 +58,14 @@ class EventServiceTest {
     void getDTOOffentlichTest() {
         CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), "test", null, GroupType.LECTURE, Visibility.PUBLIC);
         EventDTO eventDTO = eventService.getDTO(createGroupEvent);
-        assertEquals(eventDTO.isVisibility(), true);
+        assertTrue(eventDTO.isVisibility());
     }
 
     @Test
     void getDTOPrivatTest() {
         AddUserEvent addUserEvent = new AddUserEvent(eventService.checkGroup(), "test", "franz", "mueller", "a@a");
         EventDTO eventDTO = eventService.getDTO(addUserEvent);
-        assertEquals(eventDTO.isVisibility(), false);
+        assertFalse(eventDTO.isVisibility());
     }
 
 }