multistep refactoring / i18n