More javadoc cleanup