Code cleanup - Thread Pool Executor Management