refactor in order to wordlist