Testing Lights
Code cleanup part 1