diff --git a/src/main/java/de/hitec/nhplus/Main.java b/src/main/java/de/hitec/nhplus/Main.java
index 7827fc1..8628324 100644
--- a/src/main/java/de/hitec/nhplus/Main.java
+++ b/src/main/java/de/hitec/nhplus/Main.java
@@ -1,7 +1,6 @@
 package de.hitec.nhplus;
 
 import de.hitec.nhplus.datastorage.ConnectionBuilder;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
@@ -12,18 +11,35 @@ import javafx.stage.Stage;
 import java.io.IOException;
 
 /**
- * @author dominik.saeume@hmmh.ag
+ * The Applications Main Class, holding the {@link #main} Entrypoint.
+ *
+ * @author Bernd Heideman
+ * @author Dominik Säume
  */
 public class Main extends Application {
 
     private Stage primaryStage;
+
+    /**
+     * The Main Entry Point.
+     */
+    public static void main(String[] args) {
+        launch(args);
+    }
+
+    /**
+     * Implementation of the JavaFX start Hook.
+     */
     @Override
     public void start(Stage primaryStage) {
         this.primaryStage = primaryStage;
-        mainWindow();
+        executeMainApplication();
     }
 
-    public void mainWindow() {
+    /**
+     * Executes the Main Application.
+     */
+    private void executeMainApplication() {
         try {
             FXMLLoader loader = new FXMLLoader(Main.class.getResource("/de/hitec/nhplus/main/MainWindowView.fxml"));
             TabPane pane = loader.load();
@@ -44,7 +60,4 @@ public class Main extends Application {
         }
     }
 
-    public static void main(String[] args) {
-        launch(args);
-    }
 }