DAR-959: Simplify code