WORDS-208 , some refactoring