Use of Multiple Executors/ Clean Up

-Use Multiple Executors/ Simplify Logic
-Code formatting and clean up
-Removal of unused classes
Sure, will put the style changes in a separate PR.