downlader refactorings