Do the same refactoring for client download data