cleaned up diff