More cleanup, and pretty listings

I've substituted it with <IP-address> as it is only used once.