Cleaned up comments to reflect changes.