Changed comments to be of Javadoc form