fixes and simplication
fixes and simplication

PaloAltoNetworks-BD/pan-configurator,PaloAltoNetworks/pan-configurator,PaloAltoNetworks/pan-configurator,PaloAltoNetworks/pan-configurator,PaloAltoNetworks-BD/pan-configurator,PaloAltoNetworks-BD/pan-configurator