diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..ff1600df
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+# All files require code owner approval from the firmware lead
+
+## Previous firmware leads are not marked as Code Owners to not get notifications / called on for every PR, but they will have admin on GitHub and can merge PRs without approval
+
+* @dchansen06
diff --git a/Lib/Platform/PlatformTemplate/chip.cmake b/Lib/Platform/PlatformTemplate/chip.cmake
index 7e0019f3..61a6f674 100644
--- a/Lib/Platform/PlatformTemplate/chip.cmake
+++ b/Lib/Platform/PlatformTemplate/chip.cmake
@@ -30,7 +30,12 @@ add_library(${CHIP}_LIB INTERFACE)
 # enable_language(C ASM)
 
 # used to strip the last 2 characters of CHIP to make the compile def
-string(SUBSTRING ${CHIP} 0 9 TEMP) # FIXME Scary
+string(
+	SUBSTRING ${CHIP}
+	0
+	9
+	TEMP
+) # FIXME Scary
 target_compile_definitions(
 	${CHIP}_LIB
 	INTERFACE
diff --git a/Lib/Platform/STM32G474xE/chip.cmake b/Lib/Platform/STM32G474xE/chip.cmake
index 27b88819..d47aeea3 100644
--- a/Lib/Platform/STM32G474xE/chip.cmake
+++ b/Lib/Platform/STM32G474xE/chip.cmake
@@ -38,7 +38,12 @@ endfunction()
 add_library(${CHIP}_LIB INTERFACE)
 
 # used to strip the last 2 characters of CHIP to make the compile def
-string(SUBSTRING ${CHIP} 0 9 TEMP) # FIXME Scary
+string(
+	SUBSTRING ${CHIP}
+	0
+	9
+	TEMP
+) # FIXME Scary
 target_compile_definitions(
 	${CHIP}_LIB
 	INTERFACE
diff --git a/Lib/Platform/STM32L476xG/chip.cmake b/Lib/Platform/STM32L476xG/chip.cmake
index 1d55decb..6a3e9fdc 100644
--- a/Lib/Platform/STM32L476xG/chip.cmake
+++ b/Lib/Platform/STM32L476xG/chip.cmake
@@ -38,7 +38,12 @@ endfunction()
 add_library(${CHIP}_LIB INTERFACE)
 
 # used to strip the last 2 characters of CHIP to make the compile def
-string(SUBSTRING ${CHIP} 0 9 TEMP) # FIXME Scary
+string(
+	SUBSTRING ${CHIP}
+	0
+	9
+	TEMP
+) # FIXME Scary
 target_compile_definitions(
 	${CHIP}_LIB
 	INTERFACE
diff --git a/Lib/Platform/STM32U5A9xJ/chip.cmake b/Lib/Platform/STM32U5A9xJ/chip.cmake
index 0956d939..713540bf 100644
--- a/Lib/Platform/STM32U5A9xJ/chip.cmake
+++ b/Lib/Platform/STM32U5A9xJ/chip.cmake
@@ -43,7 +43,12 @@ add_library(${CHIP}_LIB INTERFACE)
 
 # enable_language(C ASM)
 
-string(SUBSTRING ${CHIP} 0 9 TEMP) # FIXME Scary
+string(
+	SUBSTRING ${CHIP}
+	0
+	9
+	TEMP
+) # FIXME Scary
 target_compile_definitions(
 	${CHIP}_LIB
 	INTERFACE
diff --git a/Lib/cmake/gr-lib.cmake b/Lib/cmake/gr-lib.cmake
index a4a24572..872fd8f0 100644
--- a/Lib/cmake/gr-lib.cmake
+++ b/Lib/cmake/gr-lib.cmake
@@ -30,11 +30,7 @@ function(add_gr_project)
 			set(COMBINATOR "${GR_PROJECT}")
 		endif()
 
-		cmake_language(
-			CALL
-				add_executable_${Platform}
-				${TARGET_NAME}
-		)
+		cmake_language(CALL add_executable_${Platform} ${TARGET_NAME})
 
 		# Create unique interface library to avoid conflicts
 		set(INTERFACE_LIB "${COMBINATOR}_INTERFACE_LIB")