Refactored names and removed RetryWith combinator.