Added snmp mock up data strategy 
Cleaning up
Refactoring