Light refactoring.