Cleanup

Fixes #2