Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages
You are right that neither executor needs this code