* Small refactoring