Tightening up some javadoc