DC: refactoring

Change-Id: I5e2cc319e62685d7df3053bbf5f1ec8d3780d04a