Content Uploads: Working on feedback from pull request