diff --git a/src/mainboard/lenovo/t400/devicetree.cb b/src/mainboard/lenovo/t400/devicetree.cb
index 0eea193a13..a61d84eba6 100644
--- a/src/mainboard/lenovo/t400/devicetree.cb
+++ b/src/mainboard/lenovo/t400/devicetree.cb
@@ -152,8 +152,7 @@ chip northbridge/intel/gm45
 				end
 
 				chip ec/lenovo/pmh7
-					device pnp ff.1 on # dummy
-					end
+					device pnp ff.1 on end # dummy
 					register "backlight_enable" = "0x01"
 					register "dock_event_enable" = "0x01"
 				end
diff --git a/src/mainboard/lenovo/t440p/devicetree.cb b/src/mainboard/lenovo/t440p/devicetree.cb
index b63767e808..1022e7764e 100644
--- a/src/mainboard/lenovo/t440p/devicetree.cb
+++ b/src/mainboard/lenovo/t440p/devicetree.cb
@@ -73,8 +73,7 @@ chip northbridge/intel/haswell
 				chip ec/lenovo/pmh7
 					register "backlight_enable" = "0x01"
 					register "dock_event_enable" = "0x01"
-					device pnp ff.1 on # dummy
-					end
+					device pnp ff.1 on end # dummy
 				end
 				chip ec/lenovo/h8
 					register "beepmask0" = "0x00"
diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
index ada50f39ce..702902bb22 100644
--- a/src/mainboard/lenovo/t60/devicetree.cb
+++ b/src/mainboard/lenovo/t60/devicetree.cb
@@ -127,9 +127,7 @@ chip northbridge/intel/i945
 			device pci 1f.0 on # PCI-LPC bridge
 				subsystemid 0x17aa 0x2009
 				chip ec/lenovo/pmh7
-					device pnp ff.1 on # dummy
-					end
-
+					device pnp ff.1 on end # dummy
 					register "backlight_enable" = "0x01"
 					register "dock_event_enable" = "0x01"
 				end
@@ -182,8 +180,7 @@ chip northbridge/intel/i945
 				end
 
 				chip superio/nsc/pc87384
-					device pnp 2e.0 off #FDC
-					end
+					device pnp 2e.0 off end #FDC
 
 					device pnp 2e.1 on # Parallel Port
 						io 0x60 = 0x3bc
@@ -204,8 +201,7 @@ chip northbridge/intel/i945
 						io 0x60 = 0x1620
 					end
 
-					device pnp 2e.a off # WDT
-					end
+					device pnp 2e.a off end # WDT
 				end
 			end
 			device pci 1f.2 on # SATA
diff --git a/src/mainboard/lenovo/thinkcentre_a58/devicetree.cb b/src/mainboard/lenovo/thinkcentre_a58/devicetree.cb
index 5559f7dcfd..aedbf0ca83 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/devicetree.cb
+++ b/src/mainboard/lenovo/thinkcentre_a58/devicetree.cb
@@ -51,8 +51,7 @@ chip northbridge/intel/x4x		# Northbridge
 			device pci 1b.0 on end		# Audio
 			device pci 1c.0 on end		# PCIe 1
 			device pci 1c.1 on		# PCIe 2: NIC
-				device pci 00.0 on
-				end
+				device pci 00.0 on end
 			end
 			device pci 1c.2 off end		# PCIe 3
 			device pci 1c.3 off end		# PCIe 4
diff --git a/src/mainboard/lenovo/x200/devicetree.cb b/src/mainboard/lenovo/x200/devicetree.cb
index 3c4e094f35..818eda208d 100644
--- a/src/mainboard/lenovo/x200/devicetree.cb
+++ b/src/mainboard/lenovo/x200/devicetree.cb
@@ -142,8 +142,7 @@ chip northbridge/intel/gm45
 				end
 
 				chip ec/lenovo/pmh7
-					device pnp ff.1 on # dummy
-					end
+					device pnp ff.1 on end # dummy
 					register "backlight_enable" = "0x01"
 				end
 
diff --git a/src/mainboard/lenovo/x201/devicetree.cb b/src/mainboard/lenovo/x201/devicetree.cb
index 3ababc9e9c..7f1f55a25b 100644
--- a/src/mainboard/lenovo/x201/devicetree.cb
+++ b/src/mainboard/lenovo/x201/devicetree.cb
@@ -127,8 +127,7 @@ chip northbridge/intel/nehalem
 				end
 
 				chip ec/lenovo/pmh7
-					device pnp ff.1 on # dummy
-					end
+					device pnp ff.1 on end # dummy
 					register "backlight_enable" = "0x01"
 					register "dock_event_enable" = "0x01"
 				end
diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb
index 1a914fd009..4b56e93ab7 100644
--- a/src/mainboard/lenovo/x60/devicetree.cb
+++ b/src/mainboard/lenovo/x60/devicetree.cb
@@ -111,8 +111,7 @@ chip northbridge/intel/i945
 			device pci 1f.0 on # PCI-LPC bridge
 				subsystemid 0x17aa 0x2009
 				chip ec/lenovo/pmh7
-					device pnp ff.1 on # dummy
-					end
+					device pnp ff.1 on end # dummy
 					register "backlight_enable" = "0x01"
 					register "dock_event_enable" = "0x01"
 				end
@@ -172,8 +171,7 @@ chip northbridge/intel/i945
 				end
 
 				chip superio/nsc/pc87392
-					device pnp 2e.0 off #FDC
-					end
+					device pnp 2e.0 off end #FDC
 
 					device pnp 2e.1 on # Parallel Port
 						io 0x60 = 0x3bc
@@ -194,8 +192,7 @@ chip northbridge/intel/i945
 						io 0x60 = 0x1620
 					end
 
-					device pnp 2e.a off # WDT
-					end
+					device pnp 2e.a off end # WDT
 				end
 			end
 			device pci 1f.1 on # IDE