COOPR-550: code improvements