Tidied up Downloader and DownloaderThread.