minor formatting, unused classes removed, reviewed wordlist builder problems