Use of Multiple Executors/ Clean Up

-Use Multiple Executors/ Simplify Logic
-Code formatting and clean up
-Removal of unused classes
I don't think we usually check in IDE-specific code formatting rules. Maybe leave this file out?