Clean up

Fixes #8.