COOPR-617: addressed PR comments