DC: small refactorings

Change-Id: I7709f7c4814d574287fa85527e914f7f2f7ef3f6