Cleaning of the code