Minor cleanup and improvements to EvidenceSourceSetController

Several minor cleanups and improvements to the code of **EvidenceSourceSetController**.