Refactor controllers action, class method, scope