DF#QCADOOCLS-1519 small refactor