ThreadPool and Strategy improved, cleaned up, and tested