Uploaders: [refactor] move common logic to concern
Controllers: minor refactor