Cleaning and fix