DAR-147 code review changes