Fixed comments to match previous changes