some cleanup and i18n