clean up inv i18n a bit