DAR-307

Code review changes