Whois: Clean up regexp and comments