Improved downloader.py speed

Turns out the previous 'optimization' slowed things down a LOT.