minor i18n refactoring