Followup from review, mostly javadoc