Cleaned up diff and list