Refactoring continue