Reworking the use cases to pull out some of the duplicated steps into their own use case.