Cleaning the code!