refactoring activity uploads