cleaning of the code