Updated javadoc commenting