Refactor downloader WIP

Trailing whitespace detected.