cleanups

Fixes #35