sniffer improvements, remove singleton