Cleaning and fixing all around