i18n / refactoring