Clean up and increase concurrency in CLI poller