minor cleanup of diff / patch