Refactoring: simplifying Workers and WorkProviders