Done some clean-up