minor spiders mainline refactoring
minor spiders mainline refactoring

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