refactor and improve grammar