Refactoring on download command to make it a lot less fat.