```ruby
class CommentPolicy < ApplicationPolicy
  delegate :writable?, to: :discussion_policy
  
  def index?
    true
  end
  
  def show?
    discussion_policy.show?
  end
  
  def create?
    logged_in? && !locked? && writable?
  end
  
  def update?
    owner? && !locked? && writable?
  end
  
  def destroy?
    owner? && !locked? && writable?
  end
  
  def move?
    !locked? && (owner? || moderator? || admin?) && writable?
  end
  
  def upvote?
    logged_in? && !owner? && writable?
  end
  
  def remove_upvote?
    logged_in? && !owner? && writable?
  end
  
  def locked?
    Array.wrap(record).any? do |comment|
      comment.discussion.locked?
    end
  end
  
  def discussion_policy
    DiscussionPolicy.new user, discussions
  end
  
  def discussions
    Array.wrap(record).compact.collect &:discussion
  end
  
  class Scope < Scope
    delegate :zooniverse_admin?, :permissions, to: :@discussion_scope
    
    def initialize(user, scope)
      @discussion_scope = DiscussionPolicy::Scope.new user, Discussion
      super
    end
    
    def resolve
      return scope.all if zooniverse_admin?
      scope.joins(discussion: :board).where permissions.join(' or ')
    end
    
    def discussion_scope
      DiscussionPolicy::Scope.new user, Discussion
    end
  end
end
```

Simplify discussion locked checking on comment policy
user
```ruby
class CommentPolicy < ApplicationPolicy
  delegate :writable?, to: :discussion_policy
  
  def index?
    true
  end
  
  def show?
    discussion_policy.show?
  end
  
  def create?
    logged_in? && !locked? && writable?
  end
  
  def update?
    owner? && !locked? && writable?
  end
  
  def destroy?
    owner? && !locked? && writable?
  end
  
  def move?
    !locked? && (owner? || moderator? || admin?) && writable?
  end
  
  def upvote?
    logged_in? && !owner? && writable?
  end
  
  def remove_upvote?
    logged_in? && !owner? && writable?
  end
  
  def locked?
    discussions.any? &:locked?
  end
  
  def discussion_policy
    DiscussionPolicy.new user, discussions
  end
  
  def discussions
    @_discussions ||= Array.wrap(record).compact.collect(&:discussion)
  end
  
  class Scope < Scope
    delegate :zooniverse_admin?, :permissions, to: :@discussion_scope
    
    def initialize(user, scope)
      @discussion_scope = DiscussionPolicy::Scope.new user, Discussion
      super
    end
    
    def resolve
      return scope.all if zooniverse_admin?
      scope.joins(discussion: :board).where permissions.join(' or ')
    end
    
    def discussion_scope
      DiscussionPolicy::Scope.new user, Discussion
    end
  end
end
```
assistant