Updated comments to be inline with latest changes