Cleaning and add functions