Clean up and Refactor Download Statistics