Align to new snmp module

Code cleanup - short and sweet.