diff --git a/src/mainboard/lenovo/t430/devicetree.cb b/src/mainboard/lenovo/t430/devicetree.cb
index f7e0436..cfdc3a4 100644
--- a/src/mainboard/lenovo/t430/devicetree.cb
+++ b/src/mainboard/lenovo/t430/devicetree.cb
@@ -31,6 +31,8 @@
 	end
 
 	device domain 0x0 on
+		subsystemid 0x17aa 0x21f3 inherit
+
 		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
 			register "c2_latency" = "0x0065"
 			register "docking_supported" = "1"
@@ -51,66 +53,37 @@
 			register "spi_uvscc" = "0x2005"
 			register "spi_lvscc" = "0x2005"
 
-			device pci 14.0 on # USB 3.0 Controller
-				subsystemid 0x17aa 0x21f3
-			end
-			device pci 16.0 on # Management Engine Interface 1
-				subsystemid 0x17aa 0x21f3
-			end
-			device pci 16.1 off # Management Engine Interface 2
-			end
-			device pci 16.2 off # Management Engine IDE-R
-			end
-			device pci 16.3 off # Management Engine KT
-			end
-			device pci 19.0 on # Intel Gigabit Ethernet
-				subsystemid 0x17aa 0x21f3
-			end
-			device pci 1a.0 on # USB2 EHCI #2
-				subsystemid 0x17aa 0x21f3
-			end
-			device pci 1b.0 on # High Definition Audio Audio controller
-				subsystemid 0x17aa 0x21f3
-			end
+			device pci 14.0 on end # USB 3.0 Controller
+			device pci 16.0 on end # Management Engine Interface 1
+			device pci 16.1 off end # Management Engine Interface 2
+			device pci 16.2 off end # Management Engine IDE-R
+			device pci 16.3 off end # Management Engine KT
+			device pci 19.0 on end # Intel Gigabit Ethernet
+			device pci 1a.0 on end # USB2 EHCI #2
+			device pci 1b.0 on end # High Definition Audio Audio controller
 			device pci 1c.0 on # PCIe Port #1
-				subsystemid 0x17aa 0x21f3
 				chip drivers/ricoh/rce822 # Ricoh cardreader
 					register "disable_mask" = "0x87"
 					register "sdwppol" = "1"
-					device pci 00.0 on # Ricoh SD card reader
-						subsystemid 0x17aa 0x21f3
-					end
+					device pci 00.0 on end # Ricoh SD card reader
 				end
 			end
-			device pci 1c.1 on # PCIe Port #2
-				subsystemid 0x17aa 0x21f3
-			end
+			device pci 1c.1 on end # PCIe Port #2
 			device pci 1c.2 on # PCIe Port #3
-				subsystemid 0x17aa 0x21f3
 				smbios_slot_desc "7" "3" "ExpressCard Slot" "8"
 			end
-			device pci 1c.3 off # PCIe Port #4
-			end
-			device pci 1c.4 off # PCIe Port #5
-			end
-			device pci 1c.5 off # PCIe Port #6
-			end
-			device pci 1c.6 off # PCIe Port #7
-			end
-			device pci 1c.7 off # PCIe Port #8
-			end
-			device pci 1d.0 on # USB2 EHCI #1
-				subsystemid 0x17aa 0x21f3
-			end
-			device pci 1e.0 off # PCI bridge
-			end
+			device pci 1c.3 off end # PCIe Port #4
+			device pci 1c.4 off end # PCIe Port #5
+			device pci 1c.5 off end # PCIe Port #6
+			device pci 1c.6 off end # PCIe Port #7
+			device pci 1c.7 off end # PCIe Port #8
+			device pci 1d.0 on end # USB2 EHCI #1
+			device pci 1e.0 off end # PCI bridge
 			device pci 1f.0 on # LPC bridge PCI-LPC bridge
-				subsystemid 0x17aa 0x21f3
 				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
 					device pnp ff.2 on # dummy
@@ -169,44 +142,25 @@
 					device pnp 0c31.0 on end
 				end
 			end
-			device pci 1f.2 on # SATA Controller 1
-				subsystemid 0x17aa 0x21f3
-			end
+			device pci 1f.2 on end # SATA Controller 1
 			device pci 1f.3 on # SMBus
-				subsystemid 0x17aa 0x21f3
 				chip drivers/i2c/at24rf08c # eeprom, 8 virtual devices, same chip
-					device i2c 54 on
-					end
-					device i2c 55 on
-					end
-					device i2c 56 on
-					end
-					device i2c 57 on
-					end
-					device i2c 5c on
-					end
-					device i2c 5d on
-					end
-					device i2c 5e on
-					end
-					device i2c 5f on
-					end
+					device i2c 54 on end
+					device i2c 55 on end
+					device i2c 56 on end
+					device i2c 57 on end
+					device i2c 5c on end
+					device i2c 5d on end
+					device i2c 5e on end
+					device i2c 5f on end
 				end
 			end
-			device pci 1f.5 off # SATA Controller 2
-			end
-			device pci 1f.6 off # Thermal
-			end
+			device pci 1f.5 off end # SATA Controller 2
+			device pci 1f.6 off end # Thermal
 		end
-		device pci 00.0 on # Host bridge Host bridge
-			subsystemid 0x17aa 0x21f3
-		end
-		device pci 01.0 on # PCIe Bridge for discrete graphics
-		end
-		device pci 02.0 on # Internal graphics VGA controller
-			subsystemid 0x17aa 0x21f3
-		end
-		device pci 04.0 off # Signal processing controller
-		end
+		device pci 00.0 on end # Host bridge Host bridge
+		device pci 01.0 on end # PCIe Bridge for discrete graphics
+		device pci 02.0 on end # Internal graphics VGA controller
+		device pci 04.0 off end # Signal processing controller
 	end
 end