Refactored download steps.