DAR-351 code review changes