diff --git a/puml_generator.py b/puml_generator.py
index 2318c1e..da7fb49 100644
--- a/puml_generator.py
+++ b/puml_generator.py
@@ -186,15 +186,18 @@ def gen_puml_code_from_class(java_class:JavaClass, no_pkgs:bool=False) -> str:
     if not no_pkgs:
         puml_code += f"package {class_package + " {"}\n"
 
-    puml_code += f"{class_type} \"{class_name + "\" as " + class_package + "." + class_name + " {"}\n"
+    puml_code += f"\t{class_type} \"{class_name + "\" as " + class_package + "." + class_name + " {"}\n"
 
     for field, visibility in class_fields.items():
-        puml_code += f"  {visibility} {field}\n"
+        puml_code += f"\t  {visibility} {field}\n"
 
-    for method, visibility in class_methods.items():
-        puml_code += f"  {visibility} {method}()\n"
+    for method, visibility in class_methods.items(): # TODO: no visibility if None
+        if visibility:
+            puml_code += f"\t  {visibility} {method}()\n"
+        else:
+            puml_code += f"\t  {method}()\n"
 
-    puml_code += "}\n"
+    puml_code += "\t}\n"
 
     if not no_pkgs:
         puml_code += "}\n"
@@ -203,6 +206,9 @@ def gen_puml_code_from_class(java_class:JavaClass, no_pkgs:bool=False) -> str:
         if not related_class == "*":
             puml_code += f"{class_package + "." + class_name} {relation}-- {related_class}\n"
 
+
+    puml_code += "\n"
+
     java_class.set_puml_content(puml_code)
 
     return java_class