diff --git a/examples/MagicCombo/MagicCombo.ino b/examples/MagicCombo/MagicCombo.ino
index d2114326..b216cd5f 100644
--- a/examples/MagicCombo/MagicCombo.ino
+++ b/examples/MagicCombo/MagicCombo.ino
@@ -20,51 +20,52 @@
 #include <Kaleidoscope-MagicCombo.h>
 
 void magicComboActions (uint8_t comboIndex, uint32_t leftHand, uint32_t rightHand) {
-  switch (comboIndex) {
-  case 0:
-    Serial.println ("It's a kind of magic!");
-    break;
-  }
+    switch (comboIndex) {
+    case 0:
+        Serial.println ("It's a kind of magic!");
+        break;
+    }
 }
 
 static const KaleidoscopePlugins::MagicCombo::dictionary_t dictionary[] PROGMEM = {
-  {R1C3 | R2C1 | R2C4 | R2C7, // left hand,
-   R0C11 | R1C12 | R2C14      //right hand
-  },
-  {0, 0}
+    {
+        R1C3 | R2C1 | R2C4 | R2C7, // left hand,
+        R0C11 | R1C12 | R2C14      //right hand
+    },
+    {0, 0}
 };
 
 
 const Key keymaps[][ROWS][COLS] PROGMEM = {
-  [0] = KEYMAP_STACKED
-  (
-   Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
-   Key_Backtick,      Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab,
-   Key_PageUp,        Key_A, Key_S, Key_D, Key_F, Key_G,
-   Key_PageDown,      Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape,
+    [0] = KEYMAP_STACKED
+    (
+        Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
+        Key_Backtick,      Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab,
+        Key_PageUp,        Key_A, Key_S, Key_D, Key_F, Key_G,
+        Key_PageDown,      Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape,
 
-   Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift,
-   Key_NoKey,
+        Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift,
+        Key_NoKey,
 
-   Key_skip,  Key_6, Key_7, Key_8,     Key_9,      Key_0,         Key_skip,
-   Key_Enter, Key_Y, Key_U, Key_I,     Key_O,      Key_P,         Key_Equals,
-              Key_H, Key_J, Key_K,     Key_L,      Key_Semicolon, Key_Quote,
-   Key_skip,  Key_N, Key_M, Key_Comma, Key_Period, Key_Slash,     Key_Minus,
+        Key_skip,  Key_6, Key_7, Key_8,     Key_9,      Key_0,         Key_skip,
+        Key_Enter, Key_Y, Key_U, Key_I,     Key_O,      Key_P,         Key_Equals,
+        Key_H, Key_J, Key_K,     Key_L,      Key_Semicolon, Key_Quote,
+        Key_skip,  Key_N, Key_M, Key_Comma, Key_Period, Key_Slash,     Key_Minus,
 
-   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
-   Key_NoKey
-  ),
+        Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
+        Key_NoKey
+    ),
 };
 
 void setup () {
-  Serial.begin (9600);
+    Serial.begin (9600);
 
-  MagicCombo.configure (dictionary);
+    MagicCombo.configure (dictionary);
 
-  Kaleidoscope.setup (KEYMAP_SIZE);
-  Kaleidoscope.use (&MagicCombo, NULL);
+    Kaleidoscope.setup (KEYMAP_SIZE);
+    Kaleidoscope.use (&MagicCombo, NULL);
 }
 
 void loop () {
-  Kaleidoscope.loop ();
+    Kaleidoscope.loop ();
 }
diff --git a/src/Kaleidoscope/MagicCombo.cpp b/src/Kaleidoscope/MagicCombo.cpp
index 50b34b91..85b9f200 100644
--- a/src/Kaleidoscope/MagicCombo.cpp
+++ b/src/Kaleidoscope/MagicCombo.cpp
@@ -30,47 +30,47 @@
 
 namespace KaleidoscopePlugins {
 
-  const MagicCombo::dictionary_t *MagicCombo::dictionary;
-  uint16_t MagicCombo::minInterval = 500;
-  uint32_t MagicCombo::endTime;
+const MagicCombo::dictionary_t *MagicCombo::dictionary;
+uint16_t MagicCombo::minInterval = 500;
+uint32_t MagicCombo::endTime;
 
-  MagicCombo::MagicCombo (void) {
-  }
+MagicCombo::MagicCombo (void) {
+}
 
-  void
-  MagicCombo::begin (void) {
+void
+MagicCombo::begin (void) {
     loop_hook_use (this->loopHook);
-  }
+}
 
-  void
-  MagicCombo::configure (const MagicCombo::dictionary_t dictionary_[]) {
+void
+MagicCombo::configure (const MagicCombo::dictionary_t dictionary_[]) {
     dictionary = (dictionary_t *)dictionary_;
-  }
+}
 
-  void
-  MagicCombo::loopHook (bool postClear) {
+void
+MagicCombo::loopHook (bool postClear) {
     if (!dictionary || postClear)
-      return;
+        return;
 
     for (byte i = 0;; i++) {
-      dictionary_t combo;
+        dictionary_t combo;
 
-      combo.leftHand = pgm_read_dword (&(dictionary[i].leftHand));
-      combo.rightHand = pgm_read_dword (&(dictionary[i].rightHand));
+        combo.leftHand = pgm_read_dword (&(dictionary[i].leftHand));
+        combo.rightHand = pgm_read_dword (&(dictionary[i].rightHand));
 
-      if (combo.leftHand == 0 && combo.rightHand == 0)
-        break;
+        if (combo.leftHand == 0 && combo.rightHand == 0)
+            break;
 
-      if (LEFTHANDSTATE.all == combo.leftHand &&
-          RIGHTHANDSTATE.all == combo.rightHand) {
-        if (millis () >= endTime) {
-          magicComboActions (i, combo.leftHand, combo.rightHand);
-          endTime = millis () + minInterval;
+        if (LEFTHANDSTATE.all == combo.leftHand &&
+                RIGHTHANDSTATE.all == combo.rightHand) {
+            if (millis () >= endTime) {
+                magicComboActions (i, combo.leftHand, combo.rightHand);
+                endTime = millis () + minInterval;
+            }
+            break;
         }
-        break;
-      }
     }
-  }
+}
 
 };
 
diff --git a/src/Kaleidoscope/MagicCombo.h b/src/Kaleidoscope/MagicCombo.h
index 4d505d0b..d7234c5b 100644
--- a/src/Kaleidoscope/MagicCombo.h
+++ b/src/Kaleidoscope/MagicCombo.h
@@ -21,10 +21,10 @@
 #include <Kaleidoscope.h>
 
 namespace KaleidoscopePlugins {
-  class MagicCombo : public KaleidoscopePlugin {
+class MagicCombo : public KaleidoscopePlugin {
   public:
     typedef struct {
-      uint32_t leftHand, rightHand;
+        uint32_t leftHand, rightHand;
     } dictionary_t;
 
     MagicCombo (void);
@@ -39,7 +39,7 @@ namespace KaleidoscopePlugins {
     static uint32_t endTime;
 
     static void loopHook (bool postClear);
-  };
+};
 };
 
 void magicComboActions (uint8_t comboIndex, uint32_t leftHand, uint32_t rightHand);