Small refactoring'