DAR-337 small changes after code review