Aesthetic changes to the Sniffer class.