Clean and update of the code