Cleanup, fixed issue #1.