Completing refactoring