add Bruno's clean-ups