Clean up, should fix #17