diff --git a/src/BootAnimation.cpp b/src/BootAnimation.cpp
index 3ba6d40f..af04676d 100644
--- a/src/BootAnimation.cpp
+++ b/src/BootAnimation.cpp
@@ -17,9 +17,9 @@ type_letter(uint8_t letter) {
 #endif
 
 void
-bootAnimation (void) {
+bootAnimation(void) {
 #ifdef ARDUINO_AVR_MODEL01
-  if (EEPROM.read (EEPROM_BOOT_ANIMATION_LOCATION))
+  if (EEPROM.read(EEPROM_BOOT_ANIMATION_LOCATION))
     return;
 
   LEDControl.set_all_leds_to(0, 0, 0);
@@ -38,6 +38,6 @@ bootAnimation (void) {
   type_letter(LED_PERIOD);
   type_letter(LED_9);
 
-  EEPROM.update (EEPROM_BOOT_ANIMATION_LOCATION, 1);
+  EEPROM.update(EEPROM_BOOT_ANIMATION_LOCATION, 1);
 #endif
 }
diff --git a/src/Kaleidoscope-LEDControl.cpp b/src/Kaleidoscope-LEDControl.cpp
index 77b80b48..be82deae 100644
--- a/src/Kaleidoscope-LEDControl.cpp
+++ b/src/Kaleidoscope-LEDControl.cpp
@@ -7,8 +7,8 @@ uint16_t LEDControl_::syncDelay = 16;
 uint32_t LEDControl_::syncTimer;
 
 void
-LEDMode::activate (void) {
-  LEDControl.activate (this);
+LEDMode::activate(void) {
+  LEDControl.activate(this);
 }
 
 void
@@ -19,11 +19,11 @@ LEDMode::begin(void) {
 
 LEDControl_::LEDControl_(void) {
   mode = previousMode = 0;
-  memset (modes, 0, LED_MAX_MODES * sizeof (modes[0]));
+  memset(modes, 0, LED_MAX_MODES * sizeof(modes[0]));
 }
 
 void
-LEDControl_::next_mode (void) {
+LEDControl_::next_mode(void) {
   mode++;
 
   if (mode >= LED_MAX_MODES) {
@@ -38,32 +38,32 @@ LEDControl_::next_mode (void) {
 }
 
 void
-LEDControl_::update (void) {
+LEDControl_::update(void) {
   if (previousMode != mode) {
-    set_all_leds_to ({0, 0, 0});
+    set_all_leds_to({0, 0, 0});
     if (modes[mode])
-      (modes[mode]->init) ();
+      (modes[mode]->init)();
   }
 
   if (modes[mode])
-    (modes[mode]->update) ();
+    (modes[mode]->update)();
 
   previousMode = mode;
 }
 
 void
-LEDControl_::set_mode (uint8_t mode_) {
+LEDControl_::set_mode(uint8_t mode_) {
   if (mode_ < LED_MAX_MODES)
     mode = mode_;
 }
 
 uint8_t
-LEDControl_::get_mode (void) {
+LEDControl_::get_mode(void) {
   return mode;
 }
 
 void
-LEDControl_::activate (LEDMode *mode) {
+LEDControl_::activate(LEDMode *mode) {
   for (uint8_t i = 0; i < LED_MAX_MODES; i++) {
     if (modes[i] == mode)
       return set_mode(i);
@@ -71,7 +71,7 @@ LEDControl_::activate (LEDMode *mode) {
 }
 
 int8_t
-LEDControl_::mode_add (LEDMode *mode) {
+LEDControl_::mode_add(LEDMode *mode) {
   for (int i = 0; i < LED_MAX_MODES; i++) {
     if (modes[i])
       continue;
@@ -119,8 +119,8 @@ LEDControl_::led_sync(void) {
 }
 
 void
-LEDControl_::begin (void) {
-  set_all_leds_to ({0, 0, 0});
+LEDControl_::begin(void) {
+  set_all_leds_to({0, 0, 0});
 
   for (uint8_t i = 0; i < LED_MAX_MODES; i++) {
     if (modes[i])
@@ -134,7 +134,7 @@ LEDControl_::begin (void) {
 }
 
 Key
-LEDControl_::eventHandler (Key mappedKey, byte row, byte col, uint8_t keyState) {
+LEDControl_::eventHandler(Key mappedKey, byte row, byte col, uint8_t keyState) {
   if (mappedKey.flags != (SYNTHETIC | IS_INTERNAL | LED_TOGGLE))
     return mappedKey;
 
@@ -145,7 +145,7 @@ LEDControl_::eventHandler (Key mappedKey, byte row, byte col, uint8_t keyState)
 }
 
 void
-LEDControl_::loopHook (bool postClear) {
+LEDControl_::loopHook(bool postClear) {
   if (postClear)
     return;
 
@@ -157,7 +157,7 @@ LEDControl_::loopHook (bool postClear) {
 }
 
 bool
-LEDControl_::focusHook (const char *command) {
+LEDControl_::focusHook(const char *command) {
   enum {
     SETALL,
     MODE,
@@ -165,96 +165,92 @@ LEDControl_::focusHook (const char *command) {
     THEME,
   } subCommand;
 
-  if (strncmp_P (command, PSTR ("led."), 4) != 0)
+  if (strncmp_P(command, PSTR("led."), 4) != 0)
     return false;
-  if (strcmp_P (command + 4, PSTR ("at")) == 0)
+  if (strcmp_P(command + 4, PSTR("at")) == 0)
     subCommand = AT;
-  else if (strcmp_P (command + 4, PSTR ("setAll")) == 0)
+  else if (strcmp_P(command + 4, PSTR("setAll")) == 0)
     subCommand = SETALL;
-  else if (strcmp_P (command + 4, PSTR ("mode")) == 0)
+  else if (strcmp_P(command + 4, PSTR("mode")) == 0)
     subCommand = MODE;
-  else if (strcmp_P (command + 4, PSTR ("theme")) == 0)
+  else if (strcmp_P(command + 4, PSTR("theme")) == 0)
     subCommand = THEME;
   else
     return false;
 
   switch (subCommand) {
-  case AT:
-    {
-      uint8_t idx = Serial.parseInt ();
+  case AT: {
+    uint8_t idx = Serial.parseInt();
 
-      if (Serial.peek () == '\n') {
-        cRGB c = LEDControl.led_get_crgb_at (idx);
+    if (Serial.peek() == '\n') {
+      cRGB c = LEDControl.led_get_crgb_at(idx);
 
-        Focus.printColor (c.r, c.g, c.b);
-        Serial.println ();
-      } else {
-        cRGB c;
+      Focus.printColor(c.r, c.g, c.b);
+      Serial.println();
+    } else {
+      cRGB c;
 
-        c.r = Serial.parseInt ();
-        c.g = Serial.parseInt ();
-        c.b = Serial.parseInt ();
+      c.r = Serial.parseInt();
+      c.g = Serial.parseInt();
+      c.b = Serial.parseInt();
 
-        LEDControl.led_set_crgb_at (idx, c);
-      }
-      break;
+      LEDControl.led_set_crgb_at(idx, c);
     }
-  case SETALL:
-    {
-      cRGB c;
+    break;
+  }
+  case SETALL: {
+    cRGB c;
 
-      c.r = Serial.parseInt ();
-      c.g = Serial.parseInt ();
-      c.b = Serial.parseInt ();
+    c.r = Serial.parseInt();
+    c.g = Serial.parseInt();
+    c.b = Serial.parseInt();
 
-      LEDControl.set_all_leds_to (c);
+    LEDControl.set_all_leds_to(c);
 
-      break;
+    break;
+  }
+  case MODE: {
+    char peek = Serial.peek();
+    if (peek == '\n') {
+      Serial.println(LEDControl.get_mode());
+    } else if (peek == 'n') {
+      LEDControl.next_mode();
+      Serial.read();
+    } else if (peek == 'p') {
+      // TODO
+      Serial.read();
+    } else {
+      uint8_t mode = Serial.parseInt();
+
+      LEDControl.set_mode(mode);
     }
-  case MODE:
-    {
-      char peek = Serial.peek ();
-      if (peek == '\n') {
-        Serial.println (LEDControl.get_mode ());
-      } else if (peek == 'n') {
-        LEDControl.next_mode ();
-        Serial.read ();
-      } else if (peek == 'p') {
-        // TODO
-        Serial.read ();
-      } else {
-        uint8_t mode = Serial.parseInt ();
-
-        LEDControl.set_mode (mode);
+    break;
+  }
+  case THEME: {
+    if (Serial.peek() == '\n') {
+      for (uint8_t idx = 0; idx < LED_COUNT; idx++) {
+        cRGB c = LEDControl.led_get_crgb_at(idx);
+
+        Focus.printColor(c.r, c.g, c.b);
+        Focus.printSpace();
       }
+      Serial.println();
       break;
     }
-  case THEME:
-    {
-      if (Serial.peek () == '\n') {
-        for (uint8_t idx = 0; idx < LED_COUNT; idx++) {
-          cRGB c = LEDControl.led_get_crgb_at (idx);
-
-          Focus.printColor (c.r, c.g, c.b);
-          Focus.printSpace ();
-        }
-        Serial.println ();
-        break;
-      }
 
-      uint8_t idx = 0;
-      while (idx < LED_COUNT && Serial.peek() != '\n') {
-        cRGB color;
+    uint8_t idx = 0;
+    while (idx < LED_COUNT && Serial.peek() != '\n') {
+      cRGB color;
 
-        color.r = Serial.parseInt ();
-        color.g = Serial.parseInt ();
-        color.b = Serial.parseInt ();
+      color.r = Serial.parseInt();
+      color.g = Serial.parseInt();
+      color.b = Serial.parseInt();
 
-        LEDControl.led_set_crgb_at (idx, color);
-        idx++;
-      }
-      break;
+      LEDControl.led_set_crgb_at(idx, color);
+      idx++;
     }
+    break;
+  }
   }
 
   return true;
diff --git a/src/Kaleidoscope-LEDControl.h b/src/Kaleidoscope-LEDControl.h
index 49b0c8df..45753748 100644
--- a/src/Kaleidoscope-LEDControl.h
+++ b/src/Kaleidoscope-LEDControl.h
@@ -10,48 +10,48 @@
 
 class LEDMode : public KaleidoscopePlugin {
  public:
-  virtual void begin (void);
-  virtual void setup (void) {};
-  virtual void init (void) {};
-  virtual void update (void) {};
-  virtual void activate (void);
+  virtual void begin(void);
+  virtual void setup(void) {};
+  virtual void init(void) {};
+  virtual void update(void) {};
+  virtual void activate(void);
 };
 
 class LEDControl_ : public KaleidoscopePlugin {
-  public:
-    LEDControl_(void);
+ public:
+  LEDControl_(void);
 
-    virtual void begin(void) final;
+  virtual void begin(void) final;
 
-    static void next_mode(void);
-    static void setup(void);
-    static void update(void);
-    static void set_mode(uint8_t mode);
-    static uint8_t get_mode();
+  static void next_mode(void);
+  static void setup(void);
+  static void update(void);
+  static void set_mode(uint8_t mode);
+  static uint8_t get_mode();
 
-    static int8_t mode_add (LEDMode *mode);
+  static int8_t mode_add(LEDMode *mode);
 
-    static void led_set_crgb_at(uint8_t i, cRGB crgb);
-    static void led_set_crgb_at(byte row, byte col, cRGB color);
-    static cRGB led_get_crgb_at(uint8_t i);
-    static void led_sync(void);
+  static void led_set_crgb_at(uint8_t i, cRGB crgb);
+  static void led_set_crgb_at(byte row, byte col, cRGB color);
+  static cRGB led_get_crgb_at(uint8_t i);
+  static void led_sync(void);
 
-    static void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b);
-    static void set_all_leds_to(cRGB color);
+  static void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b);
+  static void set_all_leds_to(cRGB color);
 
-    static void activate (LEDMode *mode);
+  static void activate(LEDMode *mode);
 
-    static uint16_t syncDelay;
+  static uint16_t syncDelay;
 
-    static bool focusHook (const char *command);
+  static bool focusHook(const char *command);
 
  private:
-    static uint32_t syncTimer;
-    static LEDMode *modes[LED_MAX_MODES];
-    static uint8_t previousMode, mode;
+  static uint32_t syncTimer;
+  static LEDMode *modes[LED_MAX_MODES];
+  static uint8_t previousMode, mode;
 
-    static Key eventHandler(Key mappedKey, byte row, byte col, uint8_t keyState);
-    static void loopHook (bool postClear);
+  static Key eventHandler(Key mappedKey, byte row, byte col, uint8_t keyState);
+  static void loopHook(bool postClear);
 };
 
 extern LEDControl_ LEDControl;
diff --git a/src/LED-Off.cpp b/src/LED-Off.cpp
index fa35f8bd..1cacc667 100644
--- a/src/LED-Off.cpp
+++ b/src/LED-Off.cpp
@@ -1,7 +1,7 @@
 #include "LED-Off.h"
 
-void LEDOff_::update (void) {
-  LEDControl.set_all_leds_to ({0, 0, 0});
+void LEDOff_::update(void) {
+  LEDControl.set_all_leds_to({0, 0, 0});
 }
 
 LEDOff_ LEDOff;
diff --git a/src/LED-Off.h b/src/LED-Off.h
index 92d041e0..6b1d1313 100644
--- a/src/LED-Off.h
+++ b/src/LED-Off.h
@@ -4,9 +4,9 @@
 
 class LEDOff_ : public LEDMode {
  public:
-  LEDOff_ (void) { };
+  LEDOff_(void) { };
 
-  virtual void update (void) final;
+  virtual void update(void) final;
 };
 
 extern LEDOff_ LEDOff;
diff --git a/src/LEDUtils.cpp b/src/LEDUtils.cpp
index 3897b5b8..f67772db 100644
--- a/src/LEDUtils.cpp
+++ b/src/LEDUtils.cpp
@@ -1,22 +1,22 @@
 #include "LEDUtils.h"
 
 cRGB
-breath_compute () {
+breath_compute() {
 
-    // This code is adapted from FastLED lib8tion.h as of dd5d96c6b289cb6b4b891748a4aeef3ddceaf0e6
-    // Eventually, we should consider just using FastLED
+  // This code is adapted from FastLED lib8tion.h as of dd5d96c6b289cb6b4b891748a4aeef3ddceaf0e6
+  // Eventually, we should consider just using FastLED
 
-    uint8_t i = (uint16_t)millis()/12; 
+  uint8_t i = (uint16_t)millis()/12;
 
-    if( i & 0x80) {
-        i = 255 - i;
-    }
+  if (i & 0x80) {
+    i = 255 - i;
+  }
 
-    i = i << 1;
-    uint8_t ii = (i*i)>>8;
-    uint8_t iii = (ii*i)>>8;
+  i = i << 1;
+  uint8_t ii = (i*i)>>8;
+  uint8_t iii = (ii*i)>>8;
 
-    i =  (( (3 * (uint16_t)(ii)) - ( 2 * (uint16_t)(iii))) / 2) + 2;
+  i = (((3 * (uint16_t)(ii)) - (2 * (uint16_t)(iii))) / 2) + 2;
 
   return hsv_to_rgb(200, 255, i);
 }
@@ -32,7 +32,7 @@ hsv_to_rgb(uint16_t h, uint16_t s, uint16_t v) {
    * math */
   uint16_t region, fpart, p, q, t;
 
-  if(s == 0) {
+  if (s == 0) {
     /* color is grayscale */
     color.r = color.g = color.b = v;
     return color;
@@ -49,7 +49,7 @@ hsv_to_rgb(uint16_t h, uint16_t s, uint16_t v) {
   t = (v * (255 - ((s * (255 - fpart)) >> 8))) >> 8;
 
   /* assign temp vars based on color cone region */
-  switch(region) {
+  switch (region) {
   case 0:
     color.r = v;
     color.g = t;
diff --git a/src/LEDUtils.h b/src/LEDUtils.h
index 7fbfd8c3..70929ce7 100644
--- a/src/LEDUtils.h
+++ b/src/LEDUtils.h
@@ -2,5 +2,5 @@
 
 #include <Kaleidoscope.h>
 
-cRGB breath_compute (void);
+cRGB breath_compute(void);
 cRGB hsv_to_rgb(uint16_t h, uint16_t s, uint16_t v);