Some wordings and cosmetic changes