final cleaning of the code