tidy of conditions in addDownloadEstimate