refined the saving of donor information
removed unneeded imports