Update the javadoc and comment