A better delete, and minor clean up
Merge pull request #17 from mbk/better-delete

A better delete, and minor clean up