Edit a few comments to make more sense