Cleaned up word list handling