Code cleanup, improved error handling
Cleaned up code pertaining to RunnerPool and promise generation