Feature/wordings

Adjust wording contents