Small refactoring
Small refactoring