diff --git a/core/encoding/json/types.odin b/core/encoding/json/types.odin
index 9b3124369..d016cf560 100644
--- a/core/encoding/json/types.odin
+++ b/core/encoding/json/types.odin
@@ -24,7 +24,7 @@ Value :: struct {
 		String,
 		Array,
 		Object,
-	}
+	},
 }
 
 Pos :: struct {
diff --git a/core/log/log.odin b/core/log/log.odin
index 93cca2a88..418ad617e 100644
--- a/core/log/log.odin
+++ b/core/log/log.odin
@@ -38,7 +38,7 @@ Options :: bit_set[Option];
 
 Full_Timestamp_Opts :: Options{
 	.Date,
-	.Time
+	.Time,
 };
 Location_Header_Opts :: Options{
 	.Short_File_Path,
@@ -48,7 +48,7 @@ Location_Header_Opts :: Options{
 };
 Location_File_Opts :: Options{
 	.Short_File_Path,
-	.Long_File_Path
+	.Long_File_Path,
 };
 
 
diff --git a/core/runtime/core_builtin_soa.odin b/core/runtime/core_builtin_soa.odin
index 161c85bc5..fea0d7305 100644
--- a/core/runtime/core_builtin_soa.odin
+++ b/core/runtime/core_builtin_soa.odin
@@ -47,7 +47,7 @@ Raw_SOA_Footer_Slice :: struct {
 Raw_SOA_Footer_Dynamic_Array :: struct {
 	len: int,
 	cap: int,
-	allocator: Allocator
+	allocator: Allocator,
 }
 
 raw_soa_footer_slice :: proc(array: ^$T/#soa[]$E) -> (footer: ^Raw_SOA_Footer_Slice) {
diff --git a/core/runtime/dynamic_map_internal.odin b/core/runtime/dynamic_map_internal.odin
index f8a192b02..8b63e6a7b 100644
--- a/core/runtime/dynamic_map_internal.odin
+++ b/core/runtime/dynamic_map_internal.odin
@@ -274,16 +274,15 @@ __dynamic_map_set :: proc(h: Map_Header, hash: Map_Hash, value: rawptr, loc := #
 			h.m.hashes[fr.hash_index] = index;
 		}
 	}
-	{
-		e := __dynamic_map_get_entry(h, index);
-		e.hash = hash.hash;
 
-		key := rawptr(uintptr(e) + h.key_offset);
-		mem_copy(key, hash.key_ptr, h.key_size);
+	e := __dynamic_map_get_entry(h, index);
+	e.hash = hash.hash;
 
-		val := rawptr(uintptr(e) + h.value_offset);
-		mem_copy(val, value, h.value_size);
-	}
+	key := rawptr(uintptr(e) + h.key_offset);
+	mem_copy(key, hash.key_ptr, h.key_size);
+
+	val := rawptr(uintptr(e) + h.value_offset);
+	mem_copy(val, value, h.value_size);
 
 	if __dynamic_map_full(h) {
 		__dynamic_map_grow(h, loc);
diff --git a/core/sys/win32/general.odin b/core/sys/win32/general.odin
index 4c4eaa289..3f78397f3 100644
--- a/core/sys/win32/general.odin
+++ b/core/sys/win32/general.odin
@@ -44,7 +44,7 @@ Wnd_Class_A :: struct {
 	icon:                  Hicon,
 	cursor:                Hcursor,
 	background:            Hbrush,
-	menu_name, class_name: cstring
+	menu_name, class_name: cstring,
 }
 
 Wnd_Class_W :: struct {
@@ -55,7 +55,7 @@ Wnd_Class_W :: struct {
 	icon:                  Hicon,
 	cursor:                Hcursor,
 	background:            Hbrush,
-	menu_name, class_name: Wstring
+	menu_name, class_name: Wstring,
 }
 
 Wnd_Class_Ex_A :: struct {
@@ -169,7 +169,7 @@ Process_Information :: struct {
 	process:    Handle,
 	thread:     Handle,
 	process_id: u32,
-	thread_id:  u32
+	thread_id:  u32,
 }
 
 Startup_Info :: struct {
@@ -355,7 +355,7 @@ OS_Version_Info_Ex_A :: struct {
   service_pack_minor:   u16,
   suite_mask:           u16,
   product_type:         u8,
-  reserved:             u8
+  reserved:             u8,
 }
 
 MAPVK_VK_TO_VSC    :: 0;
@@ -947,7 +947,7 @@ Paint_Struct :: struct {
 	rc_paint:     Rect,
 	restore:      Bool,
 	inc_update:   Bool,
-	rgb_reserved: [32]byte
+	rgb_reserved: [32]byte,
 }
 
 
diff --git a/core/sys/win32/helpers.odin b/core/sys/win32/helpers.odin
index fd8b7c3c5..7e551c077 100644
--- a/core/sys/win32/helpers.odin
+++ b/core/sys/win32/helpers.odin
@@ -10,14 +10,14 @@ call_external_process :: proc(program, command_line: string) -> bool {
     return cast(bool)create_process_w(
         utf8_to_wstring(program),
         utf8_to_wstring(command_line),
-        nil, 
-        nil, 
-        Bool(false), 
-        u32(0x10), 
-        nil, 
-        nil, 
-        &si, 
-        &pi
+        nil,
+        nil,
+        Bool(false),
+        u32(0x10),
+        nil,
+        nil,
+        &si,
+        &pi,
     );
 }
 
@@ -26,4 +26,4 @@ open_website :: proc(url: string) -> bool {
 	arg := []string{"/C", "start", url};
 	args := strings.join(arg, " ", context.temp_allocator);
 	return call_external_process(p, args);
-}
\ No newline at end of file
+}