Some refactoring of words.