removing email addresses, adding some comments