Cleaned up some code and added second wordlist for testing.