Cleaned up diff