Cleaning all the code