can you refactor to use AR:Concern and also move in to app/controllers/concerns?