diff --git a/build/CodeGen/Stage1/ResultCodegen.cs b/build/CodeGen/Stage1/ResultCodegen.cs
index 1dc22964..296d8184 100644
--- a/build/CodeGen/Stage1/ResultCodegen.cs
+++ b/build/CodeGen/Stage1/ResultCodegen.cs
@@ -252,8 +252,8 @@ public static class ResultCodeGen
             sb.AppendLine();
         }
 
-        sb.AppendLine($"namespace LibHac.{ns.Name}");
-        sb.AppendLineAndIncrease("{");
+        sb.AppendLine($"namespace LibHac.{ns.Name};");
+        sb.AppendLine();
 
         sb.AppendLine($"public static class Result{ns.ClassName}");
         sb.AppendLineAndIncrease("{");
@@ -296,7 +296,7 @@ public static class ResultCodeGen
         }
 
         sb.DecreaseAndAppendLine("}");
-        sb.DecreaseAndAppendLine("}");
+
 
         return sb.ToString();
     }
@@ -382,8 +382,8 @@ public static class ResultCodeGen
         sb.AppendLine("using System;");
         sb.AppendLine();
 
-        sb.AppendLine("namespace LibHac");
-        sb.AppendLineAndIncrease("{");
+        sb.AppendLine("namespace LibHac;");
+        sb.AppendLine();
 
         sb.AppendLine("internal partial class ResultNameResolver");
         sb.AppendLineAndIncrease("{");
@@ -406,7 +406,6 @@ public static class ResultCodeGen
         sb.AppendLine();
         sb.DecreaseAndAppendLine("};");
         sb.DecreaseAndAppendLine("}");
-        sb.DecreaseAndAppendLine("}");
 
         return sb.ToString();
     }
diff --git a/build/CodeGen/Stage2/KeysCodeGen.cs b/build/CodeGen/Stage2/KeysCodeGen.cs
index a18bc83d..07621c3f 100644
--- a/build/CodeGen/Stage2/KeysCodeGen.cs
+++ b/build/CodeGen/Stage2/KeysCodeGen.cs
@@ -32,8 +32,8 @@ public static class KeysCodeGen
         sb.AppendLine("using System;");
         sb.AppendLine();
 
-        sb.AppendLine("namespace LibHac.Common.Keys");
-        sb.AppendLineAndIncrease("{");
+        sb.AppendLine("namespace LibHac.Common.Keys;");
+        sb.AppendLine();
 
         sb.AppendLine("internal static partial class DefaultKeySet");
         sb.AppendLineAndIncrease("{");
@@ -50,7 +50,6 @@ public static class KeysCodeGen
         BuildArray(sb, "RsaSigningKeysProd", SpanHelpers.AsReadOnlyByteSpan(in keySet.KeyStruct._rsaSigningKeysProd));
         BuildArray(sb, "RsaKeys", SpanHelpers.AsReadOnlyByteSpan(in keySet.KeyStruct._rsaKeys));
 
-        sb.DecreaseAndAppendLine("}");
         sb.DecreaseAndAppendLine("}");
 
         return sb.ToString();