Refactor lighting