Cleanup + issue #64