finished renaming and refactor of word analysis