Small refactoring #2