diff --git a/include/ledControlls.h b/include/ledControlls.h
new file mode 100644
index 0000000..d1ce3d2
--- /dev/null
+++ b/include/ledControlls.h
@@ -0,0 +1,4 @@
+#pragma once
+
+void updateLeds(int volume);
+void resetLeds();
\ No newline at end of file
diff --git a/src/ledControlls.cpp b/src/ledControlls.cpp
new file mode 100644
index 0000000..c883909
--- /dev/null
+++ b/src/ledControlls.cpp
@@ -0,0 +1,35 @@
+#include <Arduino.h>
+#include <pinDefinitions.h>
+#include <ledControlls.h>
+
+void resetLeds()
+{
+    digitalWrite(LED_HIGH, LOW);
+    digitalWrite(LED_MED, LOW);
+    digitalWrite(LED_LOW, LOW);
+}
+
+void updateLeds(int volume)
+{
+    switch (volume)
+    {
+    case 64:
+        resetLeds();
+        digitalWrite(LED_HIGH, HIGH);
+        break;
+    case 48:
+        resetLeds();
+        digitalWrite(LED_MED, HIGH);
+        break;
+    case 32:
+        resetLeds();
+        digitalWrite(LED_LOW, HIGH);
+        break;
+    case 16:
+        resetLeds();
+        digitalWrite(LED_HIGH, HIGH);
+        digitalWrite(LED_MED, HIGH);
+        digitalWrite(LED_LOW, HIGH);
+        break;
+    }
+}
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index b50b496..e1ba6b8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,7 @@
 #include <Arduino.h>
 #include <pinDefinitions.h>
 #include <potControlls.h>
+#include <ledControlls.h>
 
 const int USER_STEPS = 2;
 const int STAFF_STEPS = 16;
@@ -18,11 +19,11 @@ bool debounceRead(int buttonPin);
 
 void setup()
 {
-  pinMode(LED_HIGH, OUTPUT);          // Green
-  pinMode(LED_MED, OUTPUT);          // Red LED (D4)
-  pinMode(LED_LOW, OUTPUT); // Green LED
+  pinMode(LED_HIGH, OUTPUT); // Green
+  pinMode(LED_MED, OUTPUT);  // Red LED (D4)
+  pinMode(LED_LOW, OUTPUT);  // Green LED
 
-  pinMode(BTN_STAFF_UP, INPUT); // SW1
+  pinMode(BTN_STAFF_UP, INPUT);  // SW1
   pinMode(BTN_STAFF_DWN, INPUT); // SW2
 
   // RF Receiver
@@ -32,7 +33,7 @@ void setup()
   pinMode(REMOTE_D, INPUT); // Remote Button D
 
   pinMode(POT_CS, OUTPUT); // D10 - CS
-  pinMode(POT_UD, OUTPUT);  // D9 - U/D
+  pinMode(POT_UD, OUTPUT); // D9 - U/D
   digitalWrite(POT_CS, HIGH);
   digitalWrite(POT_UD, LOW);
 
@@ -44,29 +45,7 @@ void setup()
 
 void loop()
 {
-  switch (maxVolume)
-  {
-  case 64:
-    digitalWrite(LED_HIGH, HIGH);
-    digitalWrite(LED_MED, LOW);
-    digitalWrite(LED_LOW, LOW);
-    break;
-  case 48:
-    digitalWrite(LED_HIGH, LOW);
-    digitalWrite(LED_MED, HIGH);
-    digitalWrite(LED_LOW, LOW);
-    break;
-  case 32:
-    digitalWrite(LED_HIGH, LOW);
-    digitalWrite(LED_MED, LOW);
-    digitalWrite(LED_LOW, HIGH);
-    break;
-  case 16:
-    digitalWrite(LED_HIGH, HIGH);
-    digitalWrite(LED_MED, HIGH);
-    digitalWrite(LED_LOW, HIGH);
-    break;
-  }
+  updateLeds(maxVolume);
 
   // SW1 - Staff Volume Up
   if (!debounceRead(BTN_STAFF_UP))
@@ -270,4 +249,6 @@ bool debounceRead(int buttonPin)
 
   // save the reading. Next time through the loop, it'll be the lastButtonState:
   lastButtonState = reading;
+
+  return false;
 }
\ No newline at end of file