Refactor i18n basics