Cleaned up duplicated run_list code