Minor refactoring and improvements to DNS evidence source