diff --git a/radio/src/loadboot.cpp b/radio/src/loadboot.cpp
index b06241019..867103916 100644
--- a/radio/src/loadboot.cpp
+++ b/radio/src/loadboot.cpp
@@ -1,34 +1,34 @@
 /****************************************************************************
-*  Copyright (c) 2014 by Michael Blandford. All rights reserved.
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*  1. Redistributions of source code must retain the above copyright
-*     notice, this list of conditions and the following disclaimer.
-*  2. Redistributions in binary form must reproduce the above copyright
-*     notice, this list of conditions and the following disclaimer in the
-*     documentation and/or other materials provided with the distribution.
-*  3. Neither the name of the author nor the names of its contributors may
-*     be used to endorse or promote products derived from this software
-*     without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-*  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-*  THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-*  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-*  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-*  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-*  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-*  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-*  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-*  SUCH DAMAGE.
-*
-****************************************************************************
-* Other Authors:
+ *  Copyright (c) 2014 by Michael Blandford. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *  3. Neither the name of the author nor the names of its contributors may
+ *     be used to endorse or promote products derived from this software
+ *     without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ *  THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ *  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ *  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ *  SUCH DAMAGE.
+ *
+ ****************************************************************************
+ * Other Authors:
  * - Andre Bernet
  * - Bertrand Songis
  * - Bryan J. Rentoul (Gruvin)
@@ -42,37 +42,35 @@
  * - Rob Thomson
  * - Romolo Manfredini
  * - Thomas Husterer
-*
-****************************************************************************/
-
+ *
+ ****************************************************************************/
 
 #include <stdint.h>
+
 #ifdef PCBSKY
 #include "AT91SAM3S4.h"
 #endif
 
 #ifdef PCBTARANIS
- #include "stm32f2xx.h"
- #include "stm32f2xx_gpio.h"
+#include "stm32f2xx.h"
+#include "stm32f2xx_gpio.h"
 #endif
 
 #if defined(PCBTARANIS)
 void bwdt_reset()
 {
-  IWDG->KR = 0xAAAA ;		// reload
+  IWDG->KR = 0xAAAA;		// reload
 }
 #endif
 
 #if defined(PCBTARANIS)
 
 __attribute__ ((section(".bootrodata"), used))
-void _bootStart( void ) ;
+void _bootStart(void);
 
 __attribute__ ((section(".isr_boot_vector"), used))
-const uint32_t BootVectors[] = {
-	(uint32_t)&_estack,
-  (uint32_t)(void (*)(void))((unsigned long)&_bootStart)
-} ;
+const uint32_t BootVectors[] = { (uint32_t) &_estack,
+    (uint32_t) (void (*)(void)) ((unsigned long) &_bootStart) };
 #endif
 
 #if defined(PCBTARANIS)
@@ -85,8 +83,7 @@ __attribute__ ((section(".bootrodata"), used))
 
 const uint8_t BootCode[] = {
 #include "bootloader.lbm"
-} ;
-
+};
 
 #if defined(PCBTARANIS)
 
@@ -94,61 +91,66 @@ __attribute__ ((section(".bootrodata"), used))
 
 void _bootStart()
 {
-	RCC->AHB1ENR |= RCC_AHB1ENR_GPIOCEN ; 		// Enable portC clock
-	RCC->AHB1ENR |= RCC_AHB1ENR_GPIOEEN ; 		// Enable portE clock
-	
-	GPIOC->PUPDR = 0x00000004 ;
-	GPIOE->PUPDR = 0x00000040 ;
+  RCC->AHB1ENR |= RCC_AHB1ENR_GPIOCEN; 		// Enable portC clock
+  RCC->AHB1ENR |= RCC_AHB1ENR_GPIOEEN; 		// Enable portE clock
 
-	uint32_t i ;
-	for ( i = 0 ; i < 50000 ; i += 1 )
-	{
-		bwdt_reset() ;
-	}
+  GPIOC->PUPDR = 0x00000004;
+  GPIOE->PUPDR = 0x00000040;
 
-	if ( (GPIOE->IDR & 0x00000008 ) == 0 )
-	{
-		if ( (GPIOC->IDR & 0x00000002 ) == 0 )
-		{
-			// Bootloader needed
-			const uint8_t *src ;
-			uint8_t *dest ;
-			uint32_t size ;
+  uint32_t i;
+  for (i = 0; i < 50000; i += 1) {
+    bwdt_reset();
+  }
 
-			bwdt_reset() ;
-			size = sizeof(BootCode) ;
-			src = BootCode ;
-			dest = (uint8_t *)0x20000000 ;
+  if ((GPIOE->IDR & 0x00000008) == 0) {
+    if ((GPIOC->IDR & 0x00000002) == 0) {
+      // Bootloader needed
+      const uint8_t *src;
+      uint8_t *dest;
+      uint32_t size;
 
-			for ( ; size ; size -= 1 )
-			{
-				*dest++ = *src++ ;		
-			}	
-			// Could check for a valid copy to RAM here
-			// Go execute bootloader
-			bwdt_reset() ;
-			
-			uint32_t address = *(uint32_t *)0x20000004 ;
-	
-			((void (*)(void)) (address))() ;		// Go execute the loaded application
-	
-		}
-	}
+      bwdt_reset();
+      size = sizeof(BootCode);
+      src = BootCode;
+      dest = (uint8_t *) 0x20000000;
+
+      for (; size; size -= 1) {
+        *dest++ = *src++;
+      }
+      // Could check for a valid copy to RAM here
+      // Go execute bootloader
+      bwdt_reset();
+
+      uint32_t address = *(uint32_t *) 0x20000004;
+
+      ((void (*)(void)) (address))();		// Go execute the loaded application
+
+    }
+  }
 //	run_application() ;	
-	asm(" mov.w	r1, #134217728");	// 0x8000000
-  asm(" add.w	r1, #32768");			// 0x8000
-	
-	asm(" movw	r0, #60680");			// 0xED08
-  asm(" movt	r0, #57344");			// 0xE000
-  asm(" str	r1, [r0, #0]");			// Set the VTOR
-	
-  asm("ldr	r0, [r1, #0]");			// Stack pointer value
-  asm("msr msp, r0");						// Set it
-  asm("ldr	r0, [r1, #4]");			// Reset address
+  asm(" mov.w	r1, #134217728");
+  // 0x8000000
+  asm(" add.w	r1, #32768");
+  // 0x8000
+
+  asm(" movw	r0, #60680");
+  // 0xED08
+  asm(" movt	r0, #57344");
+  // 0xE000
+  asm(" str	r1, [r0, #0]");
+  // Set the VTOR
+
+  asm("ldr	r0, [r1, #0]");
+  // Stack pointer value
+  asm("msr msp, r0");
+  // Set it
+  asm("ldr	r0, [r1, #4]");
+  // Reset address
   asm("mov.w	r1, #1");
-  asm("orr		r0, r1");					// Set lsbit
-  asm("bx r0");									// Execute application
+  asm("orr		r0, r1");
+  // Set lsbit
+  asm("bx r0");
+  // Execute application
 }
 #endif
 
-