some refactors regarding the lights