fix javadoc issue and improve comments