Refactored light to be more reusable