clean up some abort logic
Merge pull request #299 from HubSpot/abort_work

clean up some abort logic