Light refactoring