Cleanup (fixes #12)

Crap, wrong branch, sorry.