DAR-1724 small code-review related changes