COOPR-523: code improvements