minor refactor in discovery mainline
minor refactor in discovery mainline

simonsdave/cloudfeaster_infrastructure,simonsdave/cloudfeaster_infrastructure,simonsdave/cloudfeaster-services,simonsdave/cloudfeaster-services,simonsdave/cloudfeaster_infrastructure,simonsdave/cloudfeaster-services,simonsdave/cloudfeaster_infrastructure