Cleaning of code