Refactoring by retryable