diff --git a/templates/dotnet/Package/Models/Model.cs.twig b/templates/dotnet/Package/Models/Model.cs.twig
index d8689e54a..51a87ecf1 100644
--- a/templates/dotnet/Package/Models/Model.cs.twig
+++ b/templates/dotnet/Package/Models/Model.cs.twig
@@ -43,19 +43,19 @@ namespace {{ spec.title | caseUcfirst }}.Models
             {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}:{{' '}}
                 {%- if property.sub_schema %}
                     {%- if property.type == 'array' -%}
-                        ((JArray)map["{{ property.name }}"]).ToObject<List<Dictionary<string, object>>>().Select(it => {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: it)).ToList()
+                        ((JArray) map["{{ property.name }}"]).ToObject<List<Dictionary<string, object>>>().Select(it => {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: it)).ToList()
                     {%- else -%}
-                        {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: ((JObject)map["{{ property.name }}"]).ToObject<Dictionary<string, object>>()!)
+                        {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: ((JObject) map["{{ property.name }}"]).ToObject<Dictionary<string, object>>()!)
                     {%- endif %}
                 {%- else %}
                     {%- if property.type == 'array' -%}
-                        ((JArray)map["{{ property.name }}"]).ToObject<{{ property | typeName }}>()
+                        ((JArray) map["{{ property.name }}"]).ToObject<{{ property | typeName }}>()
                     {%- else %}
                         {%- if property.type == "integer" or property.type == "number" %}
-                            {%- if not property.required -%}map["{{ property.name }}"] == null ? null :{% endif %}Convert.To{% if property.type == "integer" %}Int64{% else %}Double{% endif %}(map["{{ property.name }}"])
+                            {%- if not property.required -%}map["{{ property.name }}"] == null ? null : {% endif %}Convert.To{% if property.type == "integer" %}Int64{% else %}Double{% endif %}(map["{{ property.name }}"])
                         {%- else %}
                             {%- if property.type == "boolean" -%}
-                                ({{ property | typeName }}{% if not property.required %}?{% endif %})map["{{ property.name }}"]
+                                ({{ property | typeName }}{% if not property.required %}?{% endif %}) map["{{ property.name }}"]
                             {%- else %}
                                 {%- if not property.required -%}
                                     map.TryGetValue("{{ property.name }}", out var {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}) ? {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}?.ToString() : null
@@ -63,15 +63,13 @@ namespace {{ spec.title | caseUcfirst }}.Models
                                     map["{{ property.name }}"].ToString()
                                 {%- endif %}
                             {%- endif %}
-                        {%~ endif %}
-                    {%~ endif %}
-                {%~ endif %}
-                {%- if not loop.last or (loop.last and definition.additionalProperties) %},
-                {%~ endif %}
+                        {%- endif %}
+                    {%- endif %}
+                {%- endif %},
+            {%~ if loop.last and definition.additionalProperties %}
+            data: map,
+            {%~ endif %}
             {%~ endfor %}
-            {%- if definition.additionalProperties %}
-                , data: map
-            {%- endif ~%}
         );
 
         public Dictionary<string, object?> ToMap() => new Dictionary<string, object?>()