Cleanup of GetBestTarget and GetBestDroneTarget
Cleanup GetBestDroneTarget