Clean up revised diff implementation