Improvements + clearing