diff --git a/client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java b/client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java
index 4aaf238..8ee37fc 100644
--- a/client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java
+++ b/client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java
@@ -242,7 +242,8 @@ public class ChatWindowController {
      */
     class WindowCloseHandler implements EventHandler<WindowEvent> {
         /**
-         *  TODO
+         * TODO
+         *
          * @param event the event which occurred
          */
         public void handle(WindowEvent event) {
diff --git a/client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowModel.java b/client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowModel.java
deleted file mode 100644
index 261283f..0000000
--- a/client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowModel.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package ch.zhaw.pm2.multichat.client;
-
-import javafx.beans.value.ObservableStringValue;
-
-public class ChatWindowModel {
-    private ClientConnectionHandler connectionHandler;
-    private ClientMessageList messages;
-    ObservableStringValue serverAddress;
-    ObservableStringValue serverPort;
-
-
-    public String getServerAddress() {
-        return serverAddress.get();
-    }
-
-    public void setServerAddress(String address) {
-        setServerAddress(address);
-    }
-
-    public String getServerPort() {
-        return getServerPort();
-    }
-
-    public void setServerPort(String address) {
-        setServerPort(address);
-    }
-
-
-}
diff --git a/client/src/main/java/ch/zhaw/pm2/multichat/client/Client.java b/client/src/main/java/ch/zhaw/pm2/multichat/client/Client.java
index 38caafc..fe2f9cc 100644
--- a/client/src/main/java/ch/zhaw/pm2/multichat/client/Client.java
+++ b/client/src/main/java/ch/zhaw/pm2/multichat/client/Client.java
@@ -2,8 +2,16 @@ package ch.zhaw.pm2.multichat.client;
 
 import javafx.application.Application;
 
+/**
+ * Client Main Class in charge of starting the UI only contains main method.
+ */
 public class Client {
 
+    /**
+     * Main method which launches the Client UI
+     *
+     * @param args no arguments needed
+     */
     public static void main(String[] args) {
         // Start UI
         System.out.println("Starting Client Application");