Refactor light