DAR-985 Code review changes