Small refactoring: