Moving forward with the refactoring