 bool SYS_DEBUG = true;
 
 #define MORSE_UNIT_TIME SLEEP_250MS
-#define NUM_LEDS 9
-#define LDR_PIN A0
-
-unsigned long arTime = millis();
-unsigned long reset = millis();
+#define NUM_LEDS        9
+#define LDR_PIN         A0
+#define NUM_CYCLES      9
+#define MIN_VOLTAGE     3200
+#define MAX_VOLTAGE     4500
+#define LDR_MIDNIGHT    60
+#define MAX_BIN_COUNT   512
+
+
+unsigned long arTime         = millis();
+unsigned long reset          = millis();
 unsigned int TIME_MULTIPLIER = 1; // x1
-unsigned int WAIT = 150*TIME_MULTIPLIER;
-unsigned int waitLynch = 33*TIME_MULTIPLIER;
-unsigned int actualPin = 2;
-
-int LDR = 0;
-long voltage = 0;
-unsigned int minVoltage = 3200;
-unsigned int ldrMinLight = 60;
+unsigned int WAIT            = 150*TIME_MULTIPLIER;
+unsigned int waitLynch       = 33*TIME_MULTIPLIER;
+unsigned int actualPin       = 2;
+
+int LDR            = 0;
+long voltage       = 0;
 bool weAreTheNight = false; 
  
-unsigned int binaryCounter = 0; // 9 bits, 0 - 512
-unsigned int morseCounter = 1;  // 1 - 9
-unsigned int lynchCounter = 1;  // 1 - 18
+unsigned int binaryCounter  = 0; // 9 bits, 0 - 512
+unsigned int morseCounter   = 1;  // 1 - 9
+unsigned int lynchCounter   = 1;  // 1 - 18
 unsigned int batteryCounter = 1;  // 1 - 9
-unsigned int cycles = 9;
-unsigned int actualCycle = 1;
-unsigned int actualStep = 1;  // 1 - 5
-bool endCycle = false;
-bool lynchON = false;
-unsigned int lynchFlicks[] = { 33,66,99,101,106,109,123,132,161 };
-
-String message = encode( "PWNED " );
-
-unsigned int ledPins[] = { 2, 3, 4, 5, 6, 7, 8, 9, 10 };
-unsigned int ledPinsRAND[] = { 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+unsigned int actualCycle    = 1;
+unsigned int actualStep     = 1;  // 1 - 5
+bool endCycle               = false;
+bool lynchON                = false;
+unsigned int lynchFlicks[]  = { 33,66,99,101,106,109,123,132,161 };
+
+String message              = encode( "PWNED " );
+
+unsigned int ledPins[]      = { 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+unsigned int ledPinsRAND[]  = { 2, 3, 4, 5, 6, 7, 8, 9, 10 };
 
 
 /////////////////////////////////////////////////////////

  if(arTime-reset > waitLynch){
    reset = millis();
    lynchON = !lynchON;
    if(lynchCounter < cycles*2){
      lynchCounter++;
    }else{
      endCycle = true;


    if(HW_DEBUG){
      // Hardware Check
      if(voltage < MIN_VOLTAGE){
        if(DEBUG){
          Serial.println("Low battery");
        }
