diff --git a/src/main/java/de/rtuni/ms/euka/Application.java b/src/main/java/de/rtuni/ms/euka/Application.java
index fd623e58ee4c880fccdc15d45585a78c490f5662..48505e2847f86743b066079310cdcf949a3b0b6c 100644
--- a/src/main/java/de/rtuni/ms/euka/Application.java
+++ b/src/main/java/de/rtuni/ms/euka/Application.java
@@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
 
 /**
- * Eureka server for registering services.
+ * Class for starting eureka server.
  * 
  * @author Julian
  *
@@ -21,11 +21,11 @@ public class Application {
     //---------------------------------------------------------------------------------------------
     
     /**
-     * Starts the application.
+     * Start the application.
      * 
      * @param args The arguments
      */
-    public static void main(final String[] args) { SpringApplication.run(Application.class, args); }
+    public static void main(String[] args) { SpringApplication.run(Application.class, args); }
 
     //---------------------------------------------------------------------------------------------
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6c5c94cef3fe7065c7feefda4e66a00b8c3908e9..2d79873f89a144096a3874e69f416aeb0f1455ab 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,16 +1,14 @@
-# Give a name to the eureka server
 spring:
   application:
-    name: eureka-server
+    name: eureka-server # Identifier of this application
 
-# HTTP Server (Tomcat) port
 server:
   port: 8761 # default port for eureka server
 
-# Configure this Discovery Server
 eureka:
-  client:  # Not a client, don't register with yourself
+  client:  
     registerWithEureka: false
     fetchRegistry: false
+    # We don't need it since the eureka server is obviously not a client.
     serviceUrl:
-      defaultZone: http://localhost:8761/eureka/ 
+      defaultZone: http://localhost:8761/eureka/ # URL of the eureka server for registration
\ No newline at end of file