DAT-2364 Address CR remark to simplify code