ThreadPool => task clean-up

Discovered the task factory stuff and seems to be a little cleaner