COOPR-605: addressed PR comments