diff --git a/OpenWatchWinder.ino b/OpenWatchWinder.ino
index 257e3e3e2b6982f84ff2b9b8b6a1b46ec2b4e710..c20c56a4e9f1247c9667985b764936a0b7be87d6 100644
--- a/OpenWatchWinder.ino
+++ b/OpenWatchWinder.ino
@@ -1,22 +1,25 @@
-#include <jled.h>
-#include <AccelStepper.h>
-#include <MultiStepper.h>
-#include <AceButton.h>
-
-using namespace ace_button;
-
+// Configuration
 #define CYCLES 1
 #define ROT_R 2
 #define ROT_L 2
-#define ROT_STEPS 4096
+#define PAUSE_MIN 2
+
+// Pins
+#define LED_PIN 5
+#define SW_PIN 4
+
+// Motor
 #define ROT_SPEED 1000
 #define ROT_ACCEL 800
 #define ROT_PAUSE 4000
+#define ROT_STEPS 4096
 
-#define PAUSE_MIN 2
+#include <jled.h>
+#include <AccelStepper.h>
+#include <MultiStepper.h>
+#include <AceButton.h>
 
-#define LED_PIN 5
-#define SW_PIN 4
+using namespace ace_button;
 
 enum StateType
 {