some clean-up in Squeezer