minor refactoring of lights.