minor cleanup
Revert "workaround for #17, what d'ya think @minad"

This reverts commit 7a80de212ebfdcead7fdaf3824e6108e9be419cd.
use class variables for exit handler

@thejefflarson: Do you think this is better?