NEXUS-5306: Javadoc and slight improvements