Refactored donor and donation list