Suffix -en for English version
Final cleanup