diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/Client.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/Client.java
index 307e6d2..60b6f89 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/Client.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Client/Client.java
@@ -18,6 +18,7 @@ public class Client {
             this.in = new BufferedReader((new InputStreamReader((socket.getInputStream()))));
 
             //TODO add the system based generated username here.
+            //TODO hide connecting logik(next 4 lines)
             this.userName = userName;
             this.out.write(getUsername());
             this.out.newLine();
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/ClientHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/ClientHandler.java
index 2e19796..1e4fd65 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/ClientHandler.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Multiplayer/Server/ClientHandler.java
@@ -15,6 +15,11 @@ public class ClientHandler implements Runnable  {
     public static HashSet<ClientHandler> inGameClients = new HashSet<>();
     public static HashSet<ClientHandler> ghostClients = new HashSet<>();
 
+    /**
+     * Implements the connecting logik in client-server
+     * architecture.
+     * @param socket
+     */
     public ClientHandler(Socket socket) {
         try {
             this.socket = socket;