Cleanup. Also fixes #3. Thanks for the contribution!