diff --git a/firmware/common/platform_gpio.c b/firmware/common/platform_gpio.c
index 3ba0dff6..66211d5f 100644
--- a/firmware/common/platform_gpio.c
+++ b/firmware/common/platform_gpio.c
@@ -67,24 +67,24 @@ const platform_gpio_t* platform_gpio(void)
 
 	/* MAX5864 SPI chip select (AD_CS / CS_AD) GPIO PinMux */
 #if defined(PRALINE)
-	gpio.max5864_select    = &GPIO6_30;
+	gpio.max5864_select = &GPIO6_30;
 #else
-	gpio.max5864_select    = &GPIO2_7;
+	gpio.max5864_select = &GPIO2_7;
 #endif
 
 	/* RF supply (VAA) control */
 #if defined(HACKRF_ONE)
-		gpio.vaa_disable   = &GPIO2_9;
+	gpio.vaa_disable = &GPIO2_9;
 #elif defined(PRALINE)
-		gpio.vaa_disable   = &GPIO4_1;
+	gpio.vaa_disable = &GPIO4_1;
 #elif defined(RAD1O)
-		gpio.vaa_enable    = &GPIO2_9;
+	gpio.vaa_enable  = &GPIO2_9;
 #endif
 
 	/* W25Q80BV Flash */
-	gpio.w25q80bv_hold     = &GPIO1_14;
-	gpio.w25q80bv_wp       = &GPIO1_15;
-	gpio.w25q80bv_select   = &GPIO5_11;
+	gpio.w25q80bv_hold   = &GPIO1_14;
+	gpio.w25q80bv_wp     = &GPIO1_15;
+	gpio.w25q80bv_select = &GPIO5_11;
 
 	/* RF switch control */
 #if defined(HACKRF_ONE)
@@ -126,20 +126,20 @@ const platform_gpio_t* platform_gpio(void)
 #endif
 
 	/* CPLD JTAG interface GPIO pins_FPGA config pins in Praline */
-	gpio.cpld_tck                  = &GPIO3_0;
+	gpio.cpld_tck       = &GPIO3_0;
 #if defined(PRALINE)
-	gpio.fpga_cfg_creset   = &GPIO2_11;
-	gpio.fpga_cfg_cdone    = &GPIO5_14;
-	gpio.fpga_cfg_spi_cs   = &GPIO2_10;
+	gpio.fpga_cfg_creset = &GPIO2_11;
+	gpio.fpga_cfg_cdone  = &GPIO5_14;
+	gpio.fpga_cfg_spi_cs = &GPIO2_10;
 #endif
 #if defined(HACKRF_ONE) || defined(RAD1O)
-	gpio.cpld_tdo          = &GPIO5_18;
-	gpio.cpld_tms          = &GPIO3_4;
-	gpio.cpld_tdi          = &GPIO3_1;
+	gpio.cpld_tdo        = &GPIO5_18;
+	gpio.cpld_tms        = &GPIO3_4;
+	gpio.cpld_tdi        = &GPIO3_1;
 #endif
 #if defined(HACKRF_ONE) || defined(PRALINE)
-	gpio.cpld_pp_tms       = &GPIO1_1;
-	gpio.cpld_pp_tdo       = &GPIO1_8;
+	gpio.cpld_pp_tms     = &GPIO1_1;
+	gpio.cpld_pp_tdo     = &GPIO1_8;
 #endif
 
 	/* Other CPLD interface GPIO pins */
@@ -155,12 +155,12 @@ const platform_gpio_t* platform_gpio(void)
 	gpio.rffc5072_data   = &GPIO3_3;
 	gpio.rffc5072_reset  = &GPIO2_14;
 #elif defined(RAD1O)
-	gpio.vco_ce        = &GPIO2_13;
-	gpio.vco_sclk      = &GPIO5_6;
-	gpio.vco_sdata     = &GPIO3_3;
-	gpio.vco_le        = &GPIO2_14;
-	gpio.vco_mux       = &GPIO5_25;
-	gpio.synt_rfout_en = &GPIO3_5;
+	gpio.vco_ce          = &GPIO2_13;
+	gpio.vco_sclk        = &GPIO5_6;
+	gpio.vco_sdata       = &GPIO3_3;
+	gpio.vco_le          = &GPIO2_14;
+	gpio.vco_mux         = &GPIO5_25;
+	gpio.synt_rfout_en   = &GPIO3_5;
 #elif defined(PRALINE)
 	gpio.rffc5072_select = &GPIO2_13;
 	gpio.rffc5072_clock  = &GPIO5_18;
@@ -171,28 +171,30 @@ const platform_gpio_t* platform_gpio(void)
 
 	/* Praline */
 #if defined(PRALINE)
-	gpio.p2_ctrl0     = &GPIO7_3;
-	gpio.p2_ctrl1     = &GPIO7_4;
-	gpio.p1_ctrl0     = &GPIO0_14;
-	gpio.p1_ctrl1     = &GPIO5_16;
-	gpio.p1_ctrl2     = &GPIO3_5;
-	gpio.clkin_ctrl   = &GPIO0_15;
-	gpio.aa_en        = &GPIO1_7;
-	gpio.trigger_in   = &GPIO6_26;
-	gpio.trigger_out  = &GPIO5_6;
-	gpio.pps_out      = &GPIO5_5;
+	gpio.p2_ctrl0    = &GPIO7_3;
+	gpio.p2_ctrl1    = &GPIO7_4;
+	gpio.p1_ctrl0    = &GPIO0_14;
+	gpio.p1_ctrl1    = &GPIO5_16;
+	gpio.p1_ctrl2    = &GPIO3_5;
+	gpio.clkin_ctrl  = &GPIO0_15;
+	gpio.aa_en       = &GPIO1_7;
+	gpio.trigger_in  = &GPIO6_26;
+	gpio.trigger_out = &GPIO5_6;
+	gpio.pps_out     = &GPIO5_5;
 #endif
 
 	/* HackRF One r9 */
 #if defined(HACKRF_ONE)
-	/* HackRF One r9 clock control */
 	if (detected_platform() == BOARD_ID_HACKRF1_R9) {
+		/* HackRF One r9 clock control */
 		gpio.h1r9_clkin_en   = &GPIO5_15;
 		gpio.h1r9_clkout_en  = &GPIO0_9;
 		gpio.h1r9_mcu_clk_en = &GPIO0_8;
 
-		gpio.h1r9_1v8_enable     = &GPIO2_9;
-		gpio.h1r9_vaa_disable    = &GPIO3_6;
+		/* HackRF One r9 power control */
+		gpio.h1r9_1v8_enable  = &GPIO2_9;
+		gpio.h1r9_vaa_disable = &GPIO3_6;
+
 		gpio.h1r9_trigger_enable = &GPIO5_5;
 	}
 #endif
diff --git a/firmware/common/platform_scu.c b/firmware/common/platform_scu.c
index af7f44dd..2da5ff7a 100644
--- a/firmware/common/platform_scu.c
+++ b/firmware/common/platform_scu.c
@@ -34,13 +34,13 @@ const platform_scu_t* platform_scu(void)
 	static platform_scu_t scu;
 
 	/* LED PinMux */
-	scu.PINMUX_LED1     = SCU_PINMUX_LED1;  /* GPIO2[1] on P4_1 */
-	scu.PINMUX_LED2     = SCU_PINMUX_LED2;  /* GPIO2[2] on P4_2 */
-	scu.PINMUX_LED3     = SCU_PINMUX_LED3;  /* GPIO2[8] on P6_12 */
+	scu.PINMUX_LED1 = SCU_PINMUX_LED1;  /* GPIO2[1] on P4_1 */
+	scu.PINMUX_LED2 = SCU_PINMUX_LED2;  /* GPIO2[2] on P4_2 */
+	scu.PINMUX_LED3 = SCU_PINMUX_LED3;  /* GPIO2[8] on P6_12 */
 #if defined(PRALINE)
-	scu.PINMUX_LED4     = (P8_6);           /* GPIO4[6] on P8_6 */
+	scu.PINMUX_LED4 = (P8_6);           /* GPIO4[6] on P8_6 */
 #elif defined(RAD1O)
-	scu.PINMUX_LED4     = (PB_6);           /* GPIO5[26] on PB_6 */
+	scu.PINMUX_LED4 = (PB_6);           /* GPIO5[26] on PB_6 */
 #endif
 
 	/* Power Supply PinMux */
@@ -200,20 +200,20 @@ const platform_scu_t* platform_scu(void)
 
 	/* RFFC5071 GPIO serial interface PinMux */
 #if defined(PRALINE)
-	scu.MIXER_ENX     = (P5_4);  /* GPIO2[13] on P5_4 */
-	scu.MIXER_SCLK    = (P9_5);  /* GPIO5[18] on P9_5 */
-	scu.MIXER_SDATA   = (P9_2);  /* GPIO4[14] on P9_2 */
-	scu.MIXER_RESETX  = (P5_5);  /* GPIO2[14] on P5_5 */
-	scu.MIXER_LD      = (PD_11); /* GPIO6[25] on PD_11 */
+	scu.MIXER_ENX    = (P5_4);  /* GPIO2[13] on P5_4 */
+	scu.MIXER_SCLK   = (P9_5);  /* GPIO5[18] on P9_5 */
+	scu.MIXER_SDATA  = (P9_2);  /* GPIO4[14] on P9_2 */
+	scu.MIXER_RESETX = (P5_5);  /* GPIO2[14] on P5_5 */
+	scu.MIXER_LD     = (PD_11); /* GPIO6[25] on PD_11 */
 
 	scu.MIXER_SCLK_PINCFG  = (SCU_GPIO_FAST | SCU_CONF_FUNCTION4);
 	scu.MIXER_SDATA_PINCFG = (SCU_GPIO_FAST | SCU_CONF_FUNCTION0);
 	scu.MIXER_LD_PINCFG    = (SCU_GPIO_FAST | SCU_CONF_FUNCTION4);
 #elif defined(JAWBREAKER) || defined(HACKRF_ONE)
-	scu.MIXER_ENX     = (P5_4);  /* GPIO2[13] on P5_4 */
-	scu.MIXER_SCLK    = (P2_6);  /* GPIO5[6] on P2_6 */
-	scu.MIXER_SDATA   = (P6_4);  /* GPIO3[3] on P6_4 */
-	scu.MIXER_RESETX  = (P5_5);  /* GPIO2[14] on P5_5 */
+	scu.MIXER_ENX    = (P5_4);  /* GPIO2[13] on P5_4 */
+	scu.MIXER_SCLK   = (P2_6);  /* GPIO5[6] on P2_6 */
+	scu.MIXER_SDATA  = (P6_4);  /* GPIO3[3] on P6_4 */
+	scu.MIXER_RESETX = (P5_5);  /* GPIO2[14] on P5_5 */
 
 	scu.MIXER_SCLK_PINCFG  = (SCU_GPIO_FAST | SCU_CONF_FUNCTION4);
 	scu.MIXER_SDATA_PINCFG = (SCU_GPIO_FAST | SCU_CONF_FUNCTION0);
@@ -312,56 +312,56 @@ const platform_scu_t* platform_scu(void)
 
 	/* HackRF One r9 */
 #if defined(HACKRF_ONE)
-	scu.H1R9_CLKIN_EN    = P6_7;   /* GPIO5[15] on P6_7 */
-	scu.H1R9_CLKOUT_EN   = P1_2;   /* GPIO0[9] on P1_2  = has boot pull-down; */
-	scu.H1R9_MCU_CLK_EN  = P1_1;   /* GPIO0[8] on P1_1  = has boot pull-up; */
-	scu.H1R9_RX          = P2_7;   /* GPIO0[7] on P4_4  = has boot pull-up; */
-	scu.H1R9_NO_ANT_PWR  = P4_4;   /* GPIO2[4] on P4_4 */
-	scu.H1R9_EN1V8       = P5_0;   /* GPIO2[9] on P5_0 */
-	scu.H1R9_NO_VAA_EN   = P6_10;  /* GPIO3[6] on P6_10 */
-	scu.H1R9_TRIGGER_EN  = P2_5;   /* GPIO5[5] on P2_5 */
+	scu.H1R9_CLKIN_EN   = P6_7;   /* GPIO5[15] on P6_7 */
+	scu.H1R9_CLKOUT_EN  = P1_2;   /* GPIO0[9] on P1_2  = has boot pull-down; */
+	scu.H1R9_MCU_CLK_EN = P1_1;   /* GPIO0[8] on P1_1  = has boot pull-up; */
+	scu.H1R9_RX         = P2_7;   /* GPIO0[7] on P4_4  = has boot pull-up; */
+	scu.H1R9_NO_ANT_PWR = P4_4;   /* GPIO2[4] on P4_4 */
+	scu.H1R9_EN1V8      = P5_0;   /* GPIO2[9] on P5_0 */
+	scu.H1R9_NO_VAA_EN  = P6_10;  /* GPIO3[6] on P6_10 */
+	scu.H1R9_TRIGGER_EN = P2_5;   /* GPIO5[5] on P2_5 */
 #endif
 
 	/* Miscellaneous */
-	scu.PINMUX_PP_D0      = (P7_0);  /* GPIO3[8] */
-	scu.PINMUX_PP_D1      = (P7_1);  /* GPIO3[9] */
-	scu.PINMUX_PP_D2      = (P7_2);  /* GPIO3[10] */
-	scu.PINMUX_PP_D3      = (P7_3);  /* GPIO3[11] */
-	scu.PINMUX_PP_D4      = (P7_4);  /* GPIO3[12] */
-	scu.PINMUX_PP_D5      = (P7_5);  /* GPIO3[13] */
-	scu.PINMUX_PP_D6      = (P7_6);  /* GPIO3[14] */
-	scu.PINMUX_PP_D7      = (P7_7);  /* GPIO3[15] */
+	scu.PINMUX_PP_D0 = (P7_0);  /* GPIO3[8] */
+	scu.PINMUX_PP_D1 = (P7_1);  /* GPIO3[9] */
+	scu.PINMUX_PP_D2 = (P7_2);  /* GPIO3[10] */
+	scu.PINMUX_PP_D3 = (P7_3);  /* GPIO3[11] */
+	scu.PINMUX_PP_D4 = (P7_4);  /* GPIO3[12] */
+	scu.PINMUX_PP_D5 = (P7_5);  /* GPIO3[13] */
+	scu.PINMUX_PP_D6 = (P7_6);  /* GPIO3[14] */
+	scu.PINMUX_PP_D7 = (P7_7);  /* GPIO3[15] */
 
 	/* TODO add other Pins */
 
-	scu.PINMUX_GPIO3_8    = (P7_0);  /* GPIO3[8] */
-	scu.PINMUX_GPIO3_9    = (P7_1);  /* GPIO3[9] */
-	scu.PINMUX_GPIO3_10   = (P7_2);  /* GPIO3[10] */
-	scu.PINMUX_GPIO3_11   = (P7_3);  /* GPIO3[11] */
-	scu.PINMUX_GPIO3_12   = (P7_4);  /* GPIO3[12] */
-	scu.PINMUX_GPIO3_13   = (P7_5);  /* GPIO3[13] */
-	scu.PINMUX_GPIO3_14   = (P7_6);  /* GPIO3[14] */
-	scu.PINMUX_GPIO3_15   = (P7_7);  /* GPIO3[15] */
+	scu.PINMUX_GPIO3_8  = (P7_0);  /* GPIO3[8] */
+	scu.PINMUX_GPIO3_9  = (P7_1);  /* GPIO3[9] */
+	scu.PINMUX_GPIO3_10 = (P7_2);  /* GPIO3[10] */
+	scu.PINMUX_GPIO3_11 = (P7_3);  /* GPIO3[11] */
+	scu.PINMUX_GPIO3_12 = (P7_4);  /* GPIO3[12] */
+	scu.PINMUX_GPIO3_13 = (P7_5);  /* GPIO3[13] */
+	scu.PINMUX_GPIO3_14 = (P7_6);  /* GPIO3[14] */
+	scu.PINMUX_GPIO3_15 = (P7_7);  /* GPIO3[15] */
 
-	scu.PINMUX_PP_TDO     = (P1_5);  /* GPIO1[8] */
-	scu.PINMUX_SD_POW     = (P1_5);  /* GPIO1[8] */
-	scu.PINMUX_SD_CMD     = (P1_6);  /* GPIO1[9] */
-	scu.PINMUX_PP_TMS     = (P1_8);  /* GPIO1[1] */
-	scu.PINMUX_SD_VOLT0   = (P1_8);  /* GPIO1[1] */
-	scu.PINMUX_SD_DAT0    = (P1_9);  /* GPIO1[2] */
-	scu.PINMUX_SD_DAT1    = (P1_10); /* GPIO1[3] */
-	scu.PINMUX_SD_DAT2    = (P1_11); /* GPIO1[4] */
-	scu.PINMUX_SD_DAT3    = (P1_12); /* GPIO1[5] */
-	scu.PINMUX_SD_CD      = (P1_13); /* GPIO1[6] */
+	scu.PINMUX_PP_TDO   = (P1_5);  /* GPIO1[8] */
+	scu.PINMUX_SD_POW   = (P1_5);  /* GPIO1[8] */
+	scu.PINMUX_SD_CMD   = (P1_6);  /* GPIO1[9] */
+	scu.PINMUX_PP_TMS   = (P1_8);  /* GPIO1[1] */
+	scu.PINMUX_SD_VOLT0 = (P1_8);  /* GPIO1[1] */
+	scu.PINMUX_SD_DAT0  = (P1_9);  /* GPIO1[2] */
+	scu.PINMUX_SD_DAT1  = (P1_10); /* GPIO1[3] */
+	scu.PINMUX_SD_DAT2  = (P1_11); /* GPIO1[4] */
+	scu.PINMUX_SD_DAT3  = (P1_12); /* GPIO1[5] */
+	scu.PINMUX_SD_CD    = (P1_13); /* GPIO1[6] */
 
 	scu.PINMUX_PP_IO_STBX = (P2_0);  /* GPIO5[0] */
 	scu.PINMUX_PP_ADDR    = (P2_1);  /* GPIO5[1] */
 	scu.PINMUX_U0_TXD     = (P2_0);  /* GPIO5[0] */
 	scu.PINMUX_U0_RXD     = (P2_1);  /* GPIO5[1] */
 
-	scu.PINMUX_ISP        = (P2_7);  /* GPIO0[7] */
+	scu.PINMUX_ISP = (P2_7);  /* GPIO0[7] */
 
-	scu.PINMUX_GP_CLKIN   = (P4_7);
+	scu.PINMUX_GP_CLKIN = (P4_7);
 
 	_platform_scu = &scu;