Moving forward with refactoring.