Update style and naming
Register retry strategies with worker
Cleanup