diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speaker/Membership.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speaker/Membership.java
index 40ab1ef..5c4f92a 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speaker/Membership.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speaker/Membership.java
@@ -3,12 +3,14 @@ package org.texttechnologylab.project.gruppe_05_1.domain.speaker;
 import java.time.LocalDate;
 import java.util.Objects;
 import java.util.StringJoiner;
-
+/**
+ * Datei implementiert von Valentin
+ */
 public class Membership {
     String      role;
-    String      member;     // TODO: wozu? Dr. Abrami hat hier die ID des Parlamentariers gespeichert
-    LocalDate   begin;        // TODO: in Mongo eigentlich Date?
-    LocalDate   end;        // TODO: in Mongo eigentlich Date?
+    String      member;
+    LocalDate   begin;
+    LocalDate   end;
     String      label;
     Integer     wp;
 
diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speaker/Speaker.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speaker/Speaker.java
index c281111..8fb08e3 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speaker/Speaker.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speaker/Speaker.java
@@ -4,7 +4,9 @@ import java.time.LocalDate;
 import java.util.List;
 import java.util.Objects;
 import java.util.StringJoiner;
-
+/**
+ * Datei implementiert von Valentin
+ */
 public abstract class Speaker {
     String      id;
     String      name;
@@ -23,9 +25,6 @@ public abstract class Speaker {
     String      primaryFoto;
     List<Membership> memberships;
 
-    // TODO: List<Speech> speeches;
-
-    // TODO: Photos
 
     public String getId() {
         return id;
diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Agenda.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Agenda.java
index b8532cd..6e64b3e 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Agenda.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Agenda.java
@@ -2,7 +2,9 @@ package org.texttechnologylab.project.gruppe_05_1.domain.speech;
 
 import java.util.Objects;
 import java.util.StringJoiner;
-
+/**
+ * Datei implementiert von Valentin
+ */
 public abstract class Agenda {
     String  index;
     String  id;
diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Comment.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Comment.java
index 3439a31..377c1aa 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Comment.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Comment.java
@@ -4,7 +4,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.StringJoiner;
-
+/**
+ * Datei implementiert von Valentin
+ */
 public abstract class Comment {
 
     String      id;
diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Protocol.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Protocol.java
index 1727e86..a7af3ec 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Protocol.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Protocol.java
@@ -4,7 +4,9 @@ import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.Objects;
 import java.util.StringJoiner;
-
+/**
+ * Datei implementiert von Valentin
+ */
 public abstract class Protocol {
     LocalDate       date;
     LocalTime       startTime;
diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Speech.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Speech.java
index ff50e6c..76d5576 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Speech.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/Speech.java
@@ -3,7 +3,9 @@ package org.texttechnologylab.project.gruppe_05_1.domain.speech;
 import java.util.List;
 import java.util.Objects;
 import java.util.StringJoiner;
-
+/**
+ * Datei implementiert von Valentin
+ */
 public abstract class Speech {
     String      id;
     String      text;
diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/SpeechMetaData.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/SpeechMetaData.java
index 1468786..735e7e0 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/SpeechMetaData.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/SpeechMetaData.java
@@ -5,16 +5,17 @@ import java.util.Objects;
 import java.util.StringJoiner;
 
 /**
+ * Datei implementiert von Valentin
  * Diese Klasse dient der Darstellung aller Reden eines Parlamentariers.
  */
 public class SpeechMetaData {
     // aus "speech" Collection
     String  speechKey;      // z.B. "ID2011400300"
-    int     speechId;      // TODO: nötig?
+    int     speechId;
     int     speakerId;
     String  speakerName;
     String  fraktion;
-    int     sessionId;      // TODO: nötig?
+    int     sessionId;
 
     // aus "sessions" Collection
     LocalDateTime       dateTime;
diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/TextContent.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/TextContent.java
index 167ae99..4bdfcc4 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/TextContent.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/domain/speech/TextContent.java
@@ -2,7 +2,9 @@ package org.texttechnologylab.project.gruppe_05_1.domain.speech;
 
 import java.util.Objects;
 import java.util.StringJoiner;
-
+/**
+ * Datei implementiert von Valentin
+ */
 public abstract class TextContent {
     String  id;
     String  speakerId;
diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/NlpUtils.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/NlpUtils.java
index 8d6d4cd..c2dc65c 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/NlpUtils.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/NlpUtils.java
@@ -50,7 +50,6 @@ public class NlpUtils {
 
 
     public static void createNlpData() {
-        // Source: Dr. Abrami - Beispiel        TODO
         duuiInit();
         runDockerDriver();
         try {