Style & doc nits

JAVA-1215