diff --git a/generator/src/FileCreator.php b/generator/src/FileCreator.php
index 610cd107..bc90f12e 100644
--- a/generator/src/FileCreator.php
+++ b/generator/src/FileCreator.php
@@ -35,10 +35,9 @@ public function generatePhpFile(array $functions, string $path): void
             \fwrite($stream, "<?php\n
 namespace Safe;
 
-use Safe\\Exceptions\\".self::toExceptionName($module). ';
-');
+use Safe\\Exceptions\\".self::toExceptionName($module). ';');
             foreach ($phpFunctions as $phpFunction) {
-                \fwrite($stream, $phpFunction."\n");
+                \fwrite($stream, "\n".$phpFunction);
             }
             \fclose($stream);
         }
diff --git a/generator/src/Parameter.php b/generator/src/Parameter.php
index 5caae117..a1f0ae18 100644
--- a/generator/src/Parameter.php
+++ b/generator/src/Parameter.php
@@ -81,11 +81,7 @@ public function isNullable(): bool
             return true;
         }
 
-        if ($this->getDefaultValue() === "null") {
-            return true;
-        }
-
-        return $this->getDefaultValue() === "NULL";
+        return ($this->getDefaultValue() === "null");
     }
 
     /*
@@ -114,6 +110,10 @@ public function getDefaultValue(): ?string
             return null;
         }
 
+        if ($initializer === "NULL") {
+            return "null";
+        }
+
         return $initializer;
     }