Refactor if i18n/ and Error/