Clean up the diff and the code.