added I18n and changed formatting