Light refactoring, no new code