Completing refactoring.