Reworking whois slightly