Clean up
Fixes #93
Fixes #93