Light refactoring for dynamo workers