Use of Multiple Executors/ Clean Up

-Use Multiple Executors/ Simplify Logic
-Code formatting and clean up
-Removal of unused classes
Should add more content here in a subsequent patch.