I clean up the code