Cleaned up code a bit, added more metadata to whois_meta