refactored download routine to start extracting it
Added lines to signalize future behaviour