Cleanup + issue #41