WORDS-198, some refactoring