Cleanup and add convenience method for run.