dc refactoring