cleanup, added safeguard against forgotten 'finish'