Small refactoring
Small refactoring
Small refactoring