Refactoring & Resuming downloads