DAR-136: Code changes after code review