diff --git a/src/UMLClass.java b/src/UMLClass.java
index a22abcf..c151d66 100644
--- a/src/UMLClass.java
+++ b/src/UMLClass.java
@@ -82,7 +82,6 @@ public class UMLClass {
 
         s.append("}");
 
-
         return s.toString();
     }
 
diff --git a/src/UMLClassView.java b/src/UMLClassView.java
index 369b913..770f325 100644
--- a/src/UMLClassView.java
+++ b/src/UMLClassView.java
@@ -98,19 +98,11 @@ public class UMLClassView {
         });
 
         defaultEncapsulationField.addKeyListener(new KeyAdapter() {
-            @Override
-            public void keyTyped(KeyEvent e) {
-                UMLManager.setDefaultEncapsulation(defaultEncapsulationField.getText() + " ");
-            }
-
-            @Override
-            public void keyPressed(KeyEvent e) {
-                UMLManager.setDefaultEncapsulation(defaultEncapsulationField.getText() + " ");
-            }
 
             @Override
             public void keyReleased(KeyEvent e) {
                 UMLManager.setDefaultEncapsulation(defaultEncapsulationField.getText() + " ");
+                refreshTextArea();
             }
         });
     }
diff --git a/src/UMLMethod.java b/src/UMLMethod.java
index bfdf122..450af9c 100644
--- a/src/UMLMethod.java
+++ b/src/UMLMethod.java
@@ -42,6 +42,7 @@ public class UMLMethod {
             };
         } else {
             this.encapsulation = UMLManager.DEFAULT_ENCAPSULATION;
+            System.out.println(UMLManager.DEFAULT_ENCAPSULATION);
         }
 
         this.name = parts[2];
@@ -94,7 +95,7 @@ public class UMLMethod {
             }
         }
 
-        returnString.append(") {\n   ");
+        returnString.append(") {\n");
 
         if(isConstructor && manager.isAutoFillConstructor()){
             for (String argsName : argsNames) {
@@ -124,10 +125,10 @@ public class UMLMethod {
      * @param line The line (not containing any linebreaks)
      */
     public void addBodyLine(String line) {
-        if (methodBody.contains("\n")) {
-            methodBody += "\n   " + line;
+        if (methodBody.equals("")) {
+            methodBody += "      " + line;
         } else {
-            methodBody += "   " + line;
+            methodBody += "\n      " + line;
         }
     }
 }