Small refactoring changes