Fix for bug in WiFi Evidence Source + some code cleanup and improvements