Update i18n strings
code cleanup