Refactoring continuation