LPS-49277 Refactor DCs and helpers to make them more consistent, avoid code duplication, and not mix responsibilities