Updated i18n handling, code formatting