Fix issue #11
Cleanup