did some clean-up