Cleaning and documentation