clean the code for next change