Multiple refactoring changes