Small refactoring;