Cleaning up some of the execution implementation