More aaa clean up and re-sort helper methods
More aaa clean up and re-sort helper methods

chrisvanheuveln/cisco-network-node-utils,cisco/cisco-network-node-utils,chrisvanheuveln/cisco-network-node-utils,cisco/cisco-network-node-utils