Display successful IP & port rather than only earlier failures
Tidy up