Clean up the code, fix i18n.