Refactoring 100% complete.