Small second refactoring