diff --git a/right/src/action.h b/right/src/action.h
index 2d042d9..9346215 100644
--- a/right/src/action.h
+++ b/right/src/action.h
@@ -1,100 +1,107 @@
 #ifndef __ACTION_H__
 #define __ACTION_H__
 
-#include <stdint.h>
-#include "lufa/HIDClassCommon.h"
-#include "usb_composite_device.h"
-#include "main.h"
+// Includes:
 
-#include "module.h"
+    #include <stdint.h>
+    #include "lufa/HIDClassCommon.h"
+    #include "usb_composite_device.h"
+    #include "main.h"
+    #include "module.h"
 
-typedef enum {
-    KeyActionType_None,
-    KeyActionType_Keystroke,
-    KeyActionType_Mouse,
-    KeyActionType_SwitchLayer,
-    KeyActionType_SwitchKeymap,
-    KeyActionType_PlayMacro,
-    KeyActionType_Test,
-} key_action_type_t;
+// Macros:
 
-typedef enum {
-    KeystrokeType_Basic,
-    KeystrokeType_Media,
-    KeystrokeType_System,
-} keystroke_type_t;
+    #define MOUSE_WHEEL_SPEED   1
+    #define MOUSE_WHEEL_DIVISOR 4
 
-typedef enum {
-    MouseButton_Left   = 1 << 0,
-    MouseButton_Right  = 1 << 1,
-    MouseButton_Middle = 1 << 2,
-    MouseButton_4      = 1 << 3,
-    MouseButton_5      = 1 << 4,
-    MouseButton_t      = 1 << 5,
-} mouse_button_t;
+    #define MOUSE_MAX_SPEED           10
+    #define MOUSE_SPEED_ACCEL_DIVISOR 50
 
-typedef enum {
-    MouseMove_Up    = 1 << 0,
-    MouseMove_Down  = 1 << 1,
-    MouseMove_Left  = 1 << 2,
-    MouseMove_Right = 1 << 3,
+// Typedefs:
 
-    MouseMove_Accelerate = 1 << 4,
-    MouseMove_Decelerate = 1 << 5,
-} mouse_move_action_t;
+    typedef enum {
+        KeyActionType_None,
+        KeyActionType_Keystroke,
+        KeyActionType_Mouse,
+        KeyActionType_SwitchLayer,
+        KeyActionType_SwitchKeymap,
+        KeyActionType_PlayMacro,
+        KeyActionType_Test,
+    } key_action_type_t;
 
-typedef enum {
-    MouseScroll_Up    = 1 << 0,
-    MouseScroll_Down  = 1 << 1,
-    MouseScroll_Left  = 1 << 2,
-    MouseScroll_Right = 1 << 3,
-} mouse_scroll_t;
+    typedef enum {
+        KeystrokeType_Basic,
+        KeystrokeType_Media,
+        KeystrokeType_System,
+    } keystroke_type_t;
 
-typedef enum {
-    TestAction_DisableUsb,
-    TestAction_DisableI2c,
-    TestAction_DisableKeyMatrixScan,
-    TestAction_DisableLedSdb,
-    TestAction_DisableLedFetPwm,
-    TestAction_DisableLedDriverPwm,
-} test_action_t;
+    typedef enum {
+        MouseButton_Left   = 1 << 0,
+        MouseButton_Right  = 1 << 1,
+        MouseButton_Middle = 1 << 2,
+        MouseButton_4      = 1 << 3,
+        MouseButton_5      = 1 << 4,
+        MouseButton_t      = 1 << 5,
+    } mouse_button_t;
 
-#define MOUSE_WHEEL_SPEED   1
-#define MOUSE_WHEEL_DIVISOR 4
+    typedef enum {
+        MouseMove_Up    = 1 << 0,
+        MouseMove_Down  = 1 << 1,
+        MouseMove_Left  = 1 << 2,
+        MouseMove_Right = 1 << 3,
 
-#define MOUSE_MAX_SPEED           10
-#define MOUSE_SPEED_ACCEL_DIVISOR 50
+        MouseMove_Accelerate = 1 << 4,
+        MouseMove_Decelerate = 1 << 5,
+    } mouse_move_action_t;
 
-typedef struct {
-    uint8_t type;
-    union {
-        struct {
-            keystroke_type_t keystrokeType;
-            uint8_t longPressAction;
-            uint8_t modifiers;
-            uint16_t scancode;
-        } __attribute__ ((packed)) keystroke;
-        struct {
-            mouse_button_t buttonActions;
-            mouse_scroll_t scrollActions;
-            mouse_move_action_t moveActions;
-        } __attribute__ ((packed)) mouse;
-        struct {
-            bool isToggle;
-            uint8_t layer;
-        } __attribute__ ((packed)) switchLayer;
-        struct {
-            uint8_t keymapId;
-        } __attribute__ ((packed)) switchKeymap;
-        struct {
-            uint16_t macroId;
-        } __attribute__ ((packed)) playMacro;
-        struct {
-            test_action_t testAction;
-        } __attribute__ ((packed)) test;
-    };
-} __attribute__ ((packed)) key_action_t;
+    typedef enum {
+        MouseScroll_Up    = 1 << 0,
+        MouseScroll_Down  = 1 << 1,
+        MouseScroll_Left  = 1 << 2,
+        MouseScroll_Right = 1 << 3,
+    } mouse_scroll_t;
 
-extern void UpdateActiveUsbReports();
+    typedef enum {
+        TestAction_DisableUsb,
+        TestAction_DisableI2c,
+        TestAction_DisableKeyMatrixScan,
+        TestAction_DisableLedSdb,
+        TestAction_DisableLedFetPwm,
+        TestAction_DisableLedDriverPwm,
+    } test_action_t;
+
+    typedef struct {
+        uint8_t type;
+        union {
+            struct {
+                keystroke_type_t keystrokeType;
+                uint8_t longPressAction;
+                uint8_t modifiers;
+                uint16_t scancode;
+            } __attribute__ ((packed)) keystroke;
+            struct {
+                mouse_button_t buttonActions;
+                mouse_scroll_t scrollActions;
+                mouse_move_action_t moveActions;
+            } __attribute__ ((packed)) mouse;
+            struct {
+                bool isToggle;
+                uint8_t layer;
+            } __attribute__ ((packed)) switchLayer;
+            struct {
+                uint8_t keymapId;
+            } __attribute__ ((packed)) switchKeymap;
+            struct {
+                uint16_t macroId;
+            } __attribute__ ((packed)) playMacro;
+            struct {
+                test_action_t testAction;
+            } __attribute__ ((packed)) test;
+        };
+    } __attribute__ ((packed)) key_action_t;
+
+// Variables:
+
+    extern void UpdateActiveUsbReports();
 
 #endif