Fix issue #53

Cleanup