More light refactoring