Further edits from Bruno's feedback