added skip-cleanup option, code cleanup
added skip_cleanup option to rerun_corrigible method