i18n + code clean up