Move task well to a partial to DRY up code