MAINT: improved sniffer readability