Use of Multiple Executors/ Clean Up

-Use Multiple Executors/ Simplify Logic
-Code formatting and clean up
-Removal of unused classes
Nice. Haven't seen this license before, but probably best that we transition to a more acceptable license. Maybe Apache 2.0 like some of our other projects?