Cleanup

Fixes #110