cleaning, rearranging and improving