Update the javadoc and comment again