move away from rails specific concerns, use a module
merge