Fix and improve wording