diff --git a/platformio.ini b/platformio.ini
index 0c06b2a3eb..b25feb4bc8 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -29,6 +29,9 @@ lib_deps =
   https://github.com/trinamic/TMC26XStepper.git
 build_flags = -I $BUILDSRC_DIR -fmax-errors=5
 
+#
+# ATmega2560
+#
 [env:megaatmega2560]
 platform = atmelavr
 framework = arduino
@@ -37,6 +40,9 @@ build_flags = ${common.build_flags}
 board_f_cpu = 16000000L
 lib_deps = ${common.lib_deps}
 
+#
+# ATmega1280
+#
 [env:megaatmega1280]
 platform = atmelavr
 framework = arduino
@@ -45,6 +51,9 @@ build_flags = ${common.build_flags}
 board_f_cpu = 16000000L
 lib_deps = ${common.lib_deps}
 
+#
+# Printrboard (Teensy 2.0)
+#
 [env:printrboard]
 platform = teensy
 framework = arduino
@@ -54,6 +63,9 @@ build_flags = ${common.build_flags} -D MOTHERBOARD=BOARD_PRINTRBOARD
 #board_f_cpu = 20000000L
 lib_deps = ${common.lib_deps}
 
+#
+# Printrboard Rev.F (Teensy 2.0)
+#
 [env:printrboard_revf]
 platform = teensy
 framework = arduino
@@ -61,6 +73,9 @@ board = teensy20pp
 build_flags = ${common.build_flags} -D MOTHERBOARD=BOARD_PRINTRBOARD_REVF
 lib_deps = ${common.lib_deps}
 
+#
+# Brainwave Pro (Teensy 2.0)
+#
 [env:brainwavepro]
 platform = teensy
 framework = arduino
@@ -68,6 +83,9 @@ board = teensy20pp
 build_flags = ${common.build_flags} -D MOTHERBOARD=BOARD_BRAINWAVE_PRO
 lib_deps = ${common.lib_deps}
 
+#
+# RAMBo
+#
 [env:rambo]
 platform = atmelavr
 framework = arduino
@@ -76,6 +94,9 @@ build_flags = ${common.build_flags}
 board_f_cpu = 16000000L
 lib_deps = ${common.lib_deps}
 
+#
+# Melzi and clones (ATmega1284p)
+#
 [env:melzi]
 platform = atmelavr
 framework = arduino
@@ -84,6 +105,10 @@ build_flags = ${common.build_flags}
 upload_speed = 57600
 lib_deps = ${common.lib_deps}
 
+#
+# Melzi and clones (ATmega1284p)
+# with Optiboot bootloader
+#
 [env:melzi_optiboot]
 platform = atmelavr
 framework = arduino
@@ -92,6 +117,9 @@ build_flags = ${common.build_flags}
 upload_speed = 115200
 lib_deps = ${common.lib_deps}
 
+#
+# Sanguinololu (ATmega644p)
+#
 [env:sanguino_atmega644p]
 platform = atmelavr
 framework = arduino