Cleaning and reorganization of examples