code cleaning and update info