diff --git a/litex/boards/platforms/arty.py b/litex/boards/platforms/arty.py
index 7a84287a4..aa38cf0a7 100644
--- a/litex/boards/platforms/arty.py
+++ b/litex/boards/platforms/arty.py
@@ -5,7 +5,9 @@
 # License: BSD
 
 from litex.build.generic_platform import *
-from litex.build.xilinx import XilinxPlatform, XC3SProg, VivadoProgrammer
+from litex.build.xilinx import XilinxPlatform, VivadoProgrammer
+
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
     ("user_led", 0, Pins("H5"), IOStandard("LVCMOS33")),
@@ -58,7 +60,8 @@ _io = [
     ("serial", 0,
         Subsignal("tx", Pins("D10")),
         Subsignal("rx", Pins("A9")),
-        IOStandard("LVCMOS33")),
+        IOStandard("LVCMOS33")
+    ),
 
     ("spi", 0,
         Subsignal("clk", Pins("F1")),
@@ -137,6 +140,8 @@ _io = [
     ),
 ]
 
+# Connectors ---------------------------------------------------------------------------------------
+
 _connectors = [
     ("pmoda", "G13 B11 A11 D12 D13 B18 A18 K16"),
     ("pmodb", "E15 E16 D15 C15 J17 J18 K15 J15"),
@@ -228,6 +233,7 @@ _connectors = [
         } ),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
 
 class Platform(XilinxPlatform):
     default_clk_name = "clk100"
diff --git a/litex/boards/platforms/avalanche.py b/litex/boards/platforms/avalanche.py
index 62ec2a346..2f4b13a8f 100644
--- a/litex/boards/platforms/avalanche.py
+++ b/litex/boards/platforms/avalanche.py
@@ -4,6 +4,8 @@
 from litex.build.generic_platform import *
 from litex.build.microsemi import MicrosemiPlatform
 
+# IOs ----------------------------------------------------------------------------------------------
+
 _io = [
     ("clk50", 0, Pins("R1"), IOStandard("LVCMOS25")),
     ("clk50", 1, Pins("J3"), IOStandard("LVCMOS25")),
@@ -82,6 +84,8 @@ _io = [
     ),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
+
 class Platform(MicrosemiPlatform):
     default_clk_name = "clk50"
     default_clk_period = 20.0
diff --git a/litex/boards/platforms/de0nano.py b/litex/boards/platforms/de0nano.py
index 4263202e1..ec3bc3035 100644
--- a/litex/boards/platforms/de0nano.py
+++ b/litex/boards/platforms/de0nano.py
@@ -5,6 +5,7 @@ from litex.build.generic_platform import *
 from litex.build.altera import AlteraPlatform
 from litex.build.altera.programmer import USBBlaster
 
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
     ("clk50", 0, Pins("R8"), IOStandard("3.3-V LVTTL")),
@@ -91,6 +92,7 @@ _io = [
     ),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
 
 class Platform(AlteraPlatform):
     default_clk_name = "clk50"
diff --git a/litex/boards/platforms/genesys2.py b/litex/boards/platforms/genesys2.py
index 8f8b1de15..1efdf1f91 100644
--- a/litex/boards/platforms/genesys2.py
+++ b/litex/boards/platforms/genesys2.py
@@ -1,6 +1,7 @@
 from litex.build.generic_platform import *
 from litex.build.xilinx import XilinxPlatform, VivadoProgrammer
 
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
     ("user_led", 0, Pins("T28"), IOStandard("LVCMOS33")),
@@ -88,6 +89,7 @@ _io = [
     ),
 ]
 
+# Connectors ---------------------------------------------------------------------------------------
 
 _connectors = [
     ("HPC", {
@@ -101,6 +103,8 @@ _connectors = [
     ),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
+
 class Platform(XilinxPlatform):
     default_clk_name = "clk200"
     default_clk_period = 5
diff --git a/litex/boards/platforms/kc705.py b/litex/boards/platforms/kc705.py
index fea45a8b3..fe6ca70b9 100644
--- a/litex/boards/platforms/kc705.py
+++ b/litex/boards/platforms/kc705.py
@@ -1,7 +1,7 @@
 from litex.build.generic_platform import *
-from litex.build.xilinx import XilinxPlatform, XC3SProg, VivadoProgrammer, iMPACT
-from litex.build.xilinx.ise import XilinxISEToolchain
+from litex.build.xilinx import XilinxPlatform, VivadoProgrammer
 
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
     ("user_led", 0, Pins("AB8"), IOStandard("LVCMOS15")),
@@ -58,7 +58,8 @@ _io = [
         Subsignal("rts", Pins("K23")),
         Subsignal("tx", Pins("K24")),
         Subsignal("rx", Pins("M19")),
-        IOStandard("LVCMOS25")),
+        IOStandard("LVCMOS25")
+    ),
 
     ("spiflash", 0,  # clock needs to be accessed through STARTUPE2
         Subsignal("cs_n", Pins("U19")),
@@ -284,6 +285,7 @@ _io = [
     ),
 ]
 
+# Connectors ---------------------------------------------------------------------------------------
 
 _connectors = [
     ("HPC", {
@@ -303,10 +305,10 @@ _connectors = [
         "DP0_C2M_N": "D1",
         "DP0_M2C_P": "E4",
         "DP0_M2C_N": "E3",
-        "LA06_P": "H30",
-        "LA06_N": "G30",
-        "LA10_P": "D29",
-        "LA10_N": "C30",
+        "LA06_P"   : "H30",
+        "LA06_N"   : "G30",
+        "LA10_P"   : "D29",
+        "LA10_N"   : "C30",
         "LA14_P": "B28",
         "LA14_N": "A28",
         "LA18_CC_P": "F21",
@@ -521,6 +523,7 @@ _connectors = [
     ),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
 
 class Platform(XilinxPlatform):
     default_clk_name = "clk156"
diff --git a/litex/boards/platforms/kcu105.py b/litex/boards/platforms/kcu105.py
index c98aaf829..eccc495f5 100644
--- a/litex/boards/platforms/kcu105.py
+++ b/litex/boards/platforms/kcu105.py
@@ -1,6 +1,7 @@
 from litex.build.generic_platform import *
 from litex.build.xilinx import XilinxPlatform, VivadoProgrammer
 
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
     ("user_led", 0, Pins("AP8"), IOStandard("LVCMOS18")),
@@ -235,6 +236,8 @@ _io = [
     ("sfp_tx_disable_n", 1, Pins("D28"), IOStandard("LVCMOS18")),
 ]
 
+# Connectors ---------------------------------------------------------------------------------------
+
 _connectors = [
     ("HPC", {
         "DP0_C2M_P": "F6",
@@ -476,6 +479,7 @@ _connectors = [
     )
 ]
 
+# Platform -----------------------------------------------------------------------------------------
 
 class Platform(XilinxPlatform):
     default_clk_name = "clk125"
diff --git a/litex/boards/platforms/machxo3.py b/litex/boards/platforms/machxo3.py
index a2a2233e9..e2e96fd23 100644
--- a/litex/boards/platforms/machxo3.py
+++ b/litex/boards/platforms/machxo3.py
@@ -5,6 +5,7 @@ from litex.build.generic_platform import *
 from litex.build.lattice import LatticePlatform
 from litex.build.lattice.programmer import LatticeProgrammer
 
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
     ("clk12", 0, Pins("C8"), IOStandard("LVCMOS33")),
@@ -30,6 +31,7 @@ _io = [
     ),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
 
 class Platform(LatticePlatform):
     default_clk_name = "clk12"
diff --git a/litex/boards/platforms/minispartan6.py b/litex/boards/platforms/minispartan6.py
index e2cdfd2ac..e0fc4af2c 100644
--- a/litex/boards/platforms/minispartan6.py
+++ b/litex/boards/platforms/minispartan6.py
@@ -3,8 +3,9 @@
 
 from litex.build.generic_platform import *
 from litex.build.xilinx import XilinxPlatform
-from litex.build.xilinx.programmer import XC3SProg, FpgaProg
+from litex.build.xilinx.programmer import FpgaProg
 
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
     ("user_led", 0, Pins("P11"), IOStandard("LVCMOS33")),
@@ -99,6 +100,8 @@ _io = [
     )
 ]
 
+# Connectors ---------------------------------------------------------------------------------------
+
 _connectors = [
     ("A", "E7 C8 D8 E8 D9 A10 B10 C10 E10 F9 F10 D11"),
     ("B", "E11 D14 D12 E12 E13 F13 F12 F14 G12 H14 J14"),
@@ -108,6 +111,7 @@ _connectors = [
     ("F", "E2 E1 E4 F4 F5 G3 F3 G1 H3 H1 H2 J1")
 ]
 
+# Platform -----------------------------------------------------------------------------------------
 
 class Platform(XilinxPlatform):
     default_clk_name = "clk32"
diff --git a/litex/boards/platforms/nexys4ddr.py b/litex/boards/platforms/nexys4ddr.py
index 359d6ec3e..d6b56efe1 100644
--- a/litex/boards/platforms/nexys4ddr.py
+++ b/litex/boards/platforms/nexys4ddr.py
@@ -2,7 +2,9 @@
 # License: BSD
 
 from litex.build.generic_platform import *
-from litex.build.xilinx import XilinxPlatform, XC3SProg, VivadoProgrammer
+from litex.build.xilinx import XilinxPlatform, VivadoProgrammer
+
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
     ("user_led",  0, Pins("H17"), IOStandard("LVCMOS33")),
@@ -81,6 +83,7 @@ _io = [
     ),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
 
 class Platform(XilinxPlatform):
     default_clk_name = "clk100"
diff --git a/litex/boards/platforms/nexys_video.py b/litex/boards/platforms/nexys_video.py
index 675704126..4a49423b9 100644
--- a/litex/boards/platforms/nexys_video.py
+++ b/litex/boards/platforms/nexys_video.py
@@ -2,7 +2,9 @@
 # License: BSD
 
 from litex.build.generic_platform import *
-from litex.build.xilinx import XilinxPlatform, XC3SProg, VivadoProgrammer
+from litex.build.xilinx import XilinxPlatform, VivadoProgrammer
+
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
     ("user_led", 0, Pins("T14"), IOStandard("LVCMOS25")),
@@ -127,6 +129,8 @@ _io = [
     ),
 ]
 
+# Connectors ---------------------------------------------------------------------------------------
+
 _connectors = [
     ("LPC", {
         "DP0_C2M_P": "D7",
@@ -211,6 +215,8 @@ _connectors = [
     )
 ]
 
+# Platform -----------------------------------------------------------------------------------------
+
 class Platform(XilinxPlatform):
     default_clk_name = "clk100"
     default_clk_period = 10.0
diff --git a/litex/boards/platforms/tinyfpga_bx.py b/litex/boards/platforms/tinyfpga_bx.py
index d3bd32645..e459188fa 100644
--- a/litex/boards/platforms/tinyfpga_bx.py
+++ b/litex/boards/platforms/tinyfpga_bx.py
@@ -2,6 +2,8 @@ from litex.build.generic_platform import *
 from litex.build.lattice import LatticePlatform
 from litex.build.lattice.programmer import TinyProgProgrammer
 
+# IOs ----------------------------------------------------------------------------------------------
+
 _io = [
     ("user_led", 0, Pins("B3"), IOStandard("LVCMOS33")),
 
@@ -30,6 +32,8 @@ _io = [
     ("clk16", 0, Pins("B2"), IOStandard("LVCMOS33"))
 ]
 
+# Connectors ---------------------------------------------------------------------------------------
+
 _connectors = [
     # A2-H2, Pins 1-13
     # H9-A6, Pins 14-24
@@ -38,7 +42,6 @@ _connectors = [
     ("EXTRA", "G1 J3 J4 G9 J9 E8 J2")
 ]
 
-
 # Default peripherals
 serial = [
     ("serial", 0,
@@ -48,6 +51,7 @@ serial = [
     )
 ]
 
+# Platform -----------------------------------------------------------------------------------------
 
 class Platform(LatticePlatform):
     default_clk_name = "clk16"
diff --git a/litex/boards/platforms/ulx3s.py b/litex/boards/platforms/ulx3s.py
index b10ab673d..ed1bcab6f 100644
--- a/litex/boards/platforms/ulx3s.py
+++ b/litex/boards/platforms/ulx3s.py
@@ -4,6 +4,7 @@
 from litex.build.generic_platform import *
 from litex.build.lattice import LatticePlatform
 
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
     ("clk25", 0, Pins("G2"), IOStandard("LVCMOS33")),
@@ -64,6 +65,7 @@ _io = [
     ),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
 
 class Platform(LatticePlatform):
     default_clk_name = "clk100"
diff --git a/litex/boards/platforms/versa_ecp3.py b/litex/boards/platforms/versa_ecp3.py
index 045f4d100..2d7a0b0cf 100644
--- a/litex/boards/platforms/versa_ecp3.py
+++ b/litex/boards/platforms/versa_ecp3.py
@@ -5,6 +5,7 @@ from litex.build.generic_platform import *
 from litex.build.lattice import LatticePlatform
 from litex.build.lattice.programmer import LatticeProgrammer
 
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
     ("clk100", 0, Pins("L5"), IOStandard("LVDS25")),
@@ -74,6 +75,7 @@ _io = [
     ),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
 
 class Platform(LatticePlatform):
     default_clk_name = "clk100"
diff --git a/litex/boards/platforms/versa_ecp5.py b/litex/boards/platforms/versa_ecp5.py
index 8368efa7a..626eabe7a 100644
--- a/litex/boards/platforms/versa_ecp5.py
+++ b/litex/boards/platforms/versa_ecp5.py
@@ -5,6 +5,7 @@ from litex.build.generic_platform import *
 from litex.build.lattice import LatticePlatform
 from litex.build.lattice.programmer import LatticeProgrammer
 
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
     ("clk100", 0, Pins("P3"), IOStandard("LVDS")),
@@ -127,6 +128,7 @@ _ecp5_soc_hat_io = [
     ),
 ]
 
+# Connectors ---------------------------------------------------------------------------------------
 
 _connectors = [
    ("X3",
@@ -174,6 +176,7 @@ _connectors = [
     ),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
 
 class Platform(LatticePlatform):
     default_clk_name = "clk100"