Cleaning and modifications.