Added comments to javadoc