Cleanup, see #53
Cleanup, see #53
Cleanup, fixes #53