Continue with refactoring