refactor word vectors in to one class