Cleaning of the code :