WORDS-396, WORDS-397, some refactoring