Refactored code and starting to parse download data