A better delete, and minor clean up

closes #13