Small refactoring change