More javadoc Improvement