Cleanup in Shrink code
Fix issue #55