Refactoring and i18n