COOPR-581: code improvements
COOPR-581: add java docs