Clean up the code, again