Refactored Wordlist