refactoring continue