Wordlists, cleaning up code