Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages
Blank line before this if block?