Small refactor in CdaCoreService.