DAR-959: Code refactor