Clean up some run logic