Cleaned up donor dictionary initialization.