Refactoring - Rewrote Light Change Event