Continue refactoring of FileDownloader class.