Just a styling tip here, ALL_CAPS usually signifies a constant (like what you removed here). Even when reviewing this code, I started from the bottom and thought I was looking at a constant so got confused by line 147