Clean the code - 3rd.