Removed VocabWord, cleaned up the code and fixed logic.