Refactor the chaining of services as a result of a run story call to remove needless complexity