COOPR-567: code improvements