Cleaning up the Download Tool code