Clean the code!