diff --git a/gateware/rtl/control_loop/control_loop.v.m4 b/gateware/rtl/control_loop/control_loop.v.m4
index a5c2656..841e038 100644
--- a/gateware/rtl/control_loop/control_loop.v.m4
+++ b/gateware/rtl/control_loop/control_loop.v.m4
@@ -1,12 +1,12 @@
+m4_changequote(`⟨', `⟩')
+m4_changecom(⟨/*⟩, ⟨*/⟩)
+m4_define(generate_macro, ⟨m4_define(M4_$1, $2)⟩)
+m4_include(control_loop_cmds.m4)
 /* Copyright 2023 (C) Peter McGoron
  * This file is a part of Upsilon, a free and open source software project.
  * For license terms, refer to the files in `doc/copying` in the Upsilon
  * source distribution.
  */
-m4_changequote(`⟨', `⟩')
-m4_changecom(⟨/*⟩, ⟨*/⟩)
-m4_define(generate_macro, ⟨m4_define(M4_$1, $2)⟩)
-m4_include(control_loop_cmds.m4)
 
 module control_loop
 #(
diff --git a/gateware/rtl/control_loop/control_loop_cmds.h.m4 b/gateware/rtl/control_loop/control_loop_cmds.h.m4
index dd8ec90..cd436a9 100644
--- a/gateware/rtl/control_loop/control_loop_cmds.h.m4
+++ b/gateware/rtl/control_loop/control_loop_cmds.h.m4
@@ -1,8 +1,3 @@
-/* Copyright 2023 (C) Peter McGoron
- * This file is a part of Upsilon, a free and open source software project.
- * For license terms, refer to the files in `doc/copying` in the Upsilon
- * source distribution.
- */
 m4_changequote(`⟨', `⟩')m4_dnl
 m4_changecom(⟨/*⟩, ⟨*/⟩)m4_dnl
 m4_define(generate_macro, ⟨m4_dnl
diff --git a/gateware/rtl/control_loop/control_loop_cmds.m4 b/gateware/rtl/control_loop/control_loop_cmds.m4
index e849546..c561bee 100644
--- a/gateware/rtl/control_loop/control_loop_cmds.m4
+++ b/gateware/rtl/control_loop/control_loop_cmds.m4
@@ -1,8 +1,3 @@
-/* Copyright 2023 (C) Peter McGoron
- * This file is a part of Upsilon, a free and open source software project.
- * For license terms, refer to the files in `doc/copying` in the Upsilon
- * source distribution.
- */
 generate_macro(CONTROL_LOOP_NOOP, 0)
 generate_macro(CONTROL_LOOP_STATUS, 1)
 generate_macro(CONTROL_LOOP_SETPT, 2)
diff --git a/gateware/rtl/control_loop/control_loop_cmds.vh.m4 b/gateware/rtl/control_loop/control_loop_cmds.vh.m4
index 5d5ff44..fae1a66 100644
--- a/gateware/rtl/control_loop/control_loop_cmds.vh.m4
+++ b/gateware/rtl/control_loop/control_loop_cmds.vh.m4
@@ -1,8 +1,3 @@
-/* Copyright 2023 (C) Peter McGoron
- * This file is a part of Upsilon, a free and open source software project.
- * For license terms, refer to the files in `doc/copying` in the Upsilon
- * source distribution.
- */
 m4_changequote(`⟨', `⟩')m4_dnl
 m4_changecom(⟨/*⟩, ⟨*/⟩)m4_dnl
 m4_define(generate_macro, ⟨m4_dnl
diff --git a/gateware/rtl/control_loop/control_loop_math.v.m4 b/gateware/rtl/control_loop/control_loop_math.v.m4
index fdef35b..7a93c39 100644
--- a/gateware/rtl/control_loop/control_loop_math.v.m4
+++ b/gateware/rtl/control_loop/control_loop_math.v.m4
@@ -1,10 +1,10 @@
+m4_changequote(`⟨', `⟩')
+m4_changecom(⟨/*⟩, ⟨*/⟩)
 /* Copyright 2023 (C) Peter McGoron
  * This file is a part of Upsilon, a free and open source software project.
  * For license terms, refer to the files in `doc/copying` in the Upsilon
  * source distribution.
  */
-m4_changequote(`⟨', `⟩')
-m4_changecom(⟨/*⟩, ⟨*/⟩)
 /*************** Precision **************
  * The control loop is designed around these values, but generally
  * does not hardcode them.
diff --git a/gateware/soc.py b/gateware/soc.py
index 8e006f4..728f7cf 100644
--- a/gateware/soc.py
+++ b/gateware/soc.py
@@ -208,7 +208,7 @@ class Base(Module, AutoCSR):
 		self.kwargs["o_test_clock"] = platform.request("test_clock")
 		self.kwargs["o_set_low"] = platform.request("differntial_output_low")
 
-        """ Dump all MMIO pins to a JSON file with their exact bit widths. """
+		""" Dump all MMIO pins to a JSON file with their exact bit widths. """
 		with open("csr_bitwidth.json", mode='w') as f:
 			import json
 			json.dump(self.csrdict, f)
@@ -254,18 +254,18 @@ class UpsilonSoC(SoCCore):
 		platform = board_spec.Platform(variant=variant, toolchain="f4pga")
 		rst = platform.request("cpu_reset")
 		self.submodules.crg = _CRG(platform, sys_clk_freq, True, rst)
-        """
+		"""
 		These source files need to be sorted so that modules
 		that rely on another module come later. For instance,
 		`control_loop` depends on `control_loop_math`, so
 		control_loop_math.v comes before control_loop.v
 
-        If you want to add a new verilog file to the design, look at the
-        modules that it refers to and place it the files with those modules.
+		If you want to add a new verilog file to the design, look at the
+		modules that it refers to and place it the files with those modules.
 
-        Since Yosys doesn't support modern Verilog, only put preprocessed
-        (if applicable) files here.
-        """
+		Since Yosys doesn't support modern Verilog, only put preprocessed
+		(if applicable) files here.
+		"""
 		platform.add_source("rtl/spi/spi_switch_preprocessed.v")
 		platform.add_source("rtl/spi/spi_master_preprocessed.v")
 		platform.add_source("rtl/spi/spi_master_no_write_preprocessed.v")