Cleaned up the downloader a bit