Comments and cosmetics changes.