Modified comments to match guide