Refactor Download/Parse Code