Intermediate refactoring