Cleanup

Fixes #11.

Closes #14.