diff --git a/main/steps/step3.cpp b/main/steps/step3.cpp
index d8ee2ee..6bd117b 100644
--- a/main/steps/step3.cpp
+++ b/main/steps/step3.cpp
@@ -4,6 +4,8 @@
 #define THREE_SECOND_TIME 90'000
 #define SIX_SECOND_TIME 75'000
 
+#define TIMES_TO_COMPLETE 4
+
 __attribute__((unused))
 static const char *TAG = "step3";
 
@@ -73,7 +75,7 @@ void step3(void) {
     int len = sizeof(star_codes)/sizeof(StarCodeHandler);
     do_star_codes(star_codes, len);
 
-    while (times < 4) {
+    while (times < TIMES_TO_COMPLETE) {
         tone = tone_dist(gen);
         // tone = 2;
         while (get_pressed_button(nullptr)) vTaskDelay(pdMS_TO_TICKS(10));
diff --git a/main/steps/step5.cpp b/main/steps/step5.cpp
index 685d0fd..03510a8 100644
--- a/main/steps/step5.cpp
+++ b/main/steps/step5.cpp
@@ -1,9 +1,19 @@
 #include "step5.h"
 
+#define TIME_CLEAR   30'000
+#define TIME_PLANK   40'000
+#define TIME_EMPTY   40'000
+#define TIME_NOTHING 25'000
+#define TIME_BLINK   35'000
+#define TIME_UMMM    35'000
+#define TIME_BLANK   40'000
+#define TIME_WHAT    60'000
+#define TIME_PLINK   40'000
+
 __attribute__((unused))
 static const char *TAG = "step5";
 
-static const int TIMES_TO_SOLVE = 9; 
+static const int TIMES_TO_SOLVE = 9;
 
 static std::random_device rd;
 static std::mt19937 gen(rd());
@@ -216,7 +226,7 @@ void step5(void) {
         switch (puzzle) {
             case 0: {
                 lcd_print(&lcd, "Clear");
-                set_module_time(30000);
+                set_module_time(TIME_CLEAR);
                 start_module_timer();
 
                 std::vector<int> indicator_options = all_leds;
@@ -249,7 +259,7 @@ void step5(void) {
             }
             case 1: {
                 lcd_print(&lcd, "Blank");
-                set_module_time(40000);
+                set_module_time(TIME_BLANK);
                 start_module_timer();
                 
                 std::uniform_int_distribution<> on_indicators_dist(16, 21);
@@ -286,7 +296,7 @@ void step5(void) {
                 break;
             }
             case 2: {
-                set_module_time(40000);
+                set_module_time(TIME_EMPTY);
                 start_module_timer();
 
                 std::map<int, int> idx_to_led_map = {
@@ -366,7 +376,7 @@ void step5(void) {
             }
             case 3: {
                 lcd_print(&lcd, "Nothing");
-                set_module_time(25000);
+                set_module_time(TIME_NOTHING);
                 start_module_timer();
 
                 const int COLOR_RED[5] = {0, 20, 10, 0};
@@ -422,7 +432,7 @@ void step5(void) {
             }
             case 4: {
                 lcd_print(&lcd, "Blink");
-                set_module_time(35000);
+                set_module_time(TIME_BLINK);
                 start_module_timer();
 
                 // buttons
@@ -481,7 +491,7 @@ void step5(void) {
             }
             case 5: {
                 lcd_print(&lcd, "Ummm");
-                set_module_time(35000);
+                set_module_time(TIME_UMMM);
                 start_module_timer();
 
                 std::uniform_int_distribution<> indicator_number_dist(0, 5);
@@ -534,7 +544,7 @@ void step5(void) {
             }
             case 6: {
                 lcd_print(&lcd, "Plank");
-                set_module_time(40000);
+                set_module_time(TIME_PLANK);
                 start_module_timer();
 
                 std::uniform_int_distribution<> led_color_dist(0, 5);
@@ -624,7 +634,7 @@ void step5(void) {
             }
             case 7: {
                 lcd_print(&lcd, "What");
-                set_module_time(55000);
+                set_module_time(TIME_WHAT);
                 start_module_timer();
 
                 std::uniform_int_distribution<> math_number_dist(1, 9);
@@ -777,7 +787,7 @@ void step5(void) {
             }
             case 8: {
                 lcd_print(&lcd, "Plink");
-                set_module_time(40000);
+                set_module_time(TIME_PLINK);
                 start_module_timer();
 
                 std::uniform_int_distribution<> indicator_number_dist(0, 4);