CAROLNIE-4: Refactor helpers.