simple refactoring changes