Cleanup whois a bit.
Use $ where applicable.