DC: more cleanups, as always. why do i code that messy anyways?

Change-Id: I731d94cc1b3a386bc01086a0100d62f463d6b5a9