Continue with the refactoring