Use of Multiple Executors/ Clean Up

-Use Multiple Executors/ Simplify Logic
-Code formatting and clean up
-Removal of unused classes
Can you please just separate the style changes into a separate PR so this one doesn't look so scary and is just about the functional changes you made. Would also make it easier to revert an individual commit, if the need arose.