refactoring & i18n