Refactored Hunspell scripts