DAR-3148 code review changes