Javadoc correction and format