cleanup and i18n