Cleaning and simplicize