Add interrupt handler to clean up