domaincontroller refactoring