B-minor fixes after a code review
Merge remote-tracking branch 'origin/delete_word' into delete_word