cleaning and updates