Cleaning the Code