Cleaning up diff with new code