Fixed the logic for performing an IP Scan and minor cosmetic
improvements.