diff --git a/.rubocop.yml b/.rubocop.yml
index 75f33f3bf0..f91fbd7087 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -5,7 +5,7 @@ inherit_gem:
   bixby: bixby_default.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   DisplayCopNames: true
   Exclude:
     - 'db/**/*'
diff --git a/.rubocop_fixme.yml b/.rubocop_fixme.yml
index 8ea6f36193..964bae6dc1 100644
--- a/.rubocop_fixme.yml
+++ b/.rubocop_fixme.yml
@@ -171,14 +171,31 @@ RSpec/RepeatedDescription:
     - 'spec/models/sipity/workflow_state_action_spec.rb'
     - 'spec/models/sipity/workflow_state_spec.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
   Exclude:
     - 'app/models/admin_set.rb'
+    - 'app/models/hyrax/permission_template.rb'
 
 # Offense count: 1
-Style/MethodMissingSuper:
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'app/services/hyrax/works/migration_service.rb'
+
+# Offense count: 12
+Lint/MissingSuper:
   Exclude:
+    - 'app/actors/hyrax/actors/interpret_visibility_actor.rb'
+    - 'app/actors/hyrax/actors/ordered_members_actor.rb'
     - 'app/models/concerns/hyrax/file_set/characterization.rb'
+    - 'app/presenters/hyrax/file_usage.rb'
+    - 'app/presenters/hyrax/work_usage.rb'
+    - 'app/services/hyrax/batch_create_failure_service.rb'
+    - 'app/services/hyrax/batch_create_success_service.rb'
+    - 'app/services/hyrax/collection_types/create_service.rb'
+    - 'app/services/hyrax/solr_query_service.rb'
+    - 'lib/hyrax/form_fields.rb'
+    - 'lib/hyrax/health_checks/solr_check.rb'
+    - 'lib/hyrax/schema.rb'
diff --git a/app/controllers/concerns/hyrax/collections_controller_behavior.rb b/app/controllers/concerns/hyrax/collections_controller_behavior.rb
index f9ab7db1c7..00fa0a48eb 100644
--- a/app/controllers/concerns/hyrax/collections_controller_behavior.rb
+++ b/app/controllers/concerns/hyrax/collections_controller_behavior.rb
@@ -41,9 +41,7 @@ def collection
     private
 
     def presenter
-      @presenter ||= begin
-        presenter_class.new(curation_concern, current_ability)
-      end
+      @presenter ||= presenter_class.new(curation_concern, current_ability)
     end
 
     def curation_concern
diff --git a/app/controllers/hyrax/dashboard/collections_controller.rb b/app/controllers/hyrax/dashboard/collections_controller.rb
index 5f515dc209..cf78ba85ba 100644
--- a/app/controllers/hyrax/dashboard/collections_controller.rb
+++ b/app/controllers/hyrax/dashboard/collections_controller.rb
@@ -376,9 +376,7 @@ def remove_select_something_first_flash
       end
 
       def presenter
-        @presenter ||= begin
-          presenter_class.new(curation_concern, current_ability)
-        end
+        @presenter ||= presenter_class.new(curation_concern, current_ability)
       end
 
       def curation_concern
diff --git a/app/controllers/hyrax/single_use_links_viewer_controller.rb b/app/controllers/hyrax/single_use_links_viewer_controller.rb
index e1a9d562e3..55b9778add 100644
--- a/app/controllers/hyrax/single_use_links_viewer_controller.rb
+++ b/app/controllers/hyrax/single_use_links_viewer_controller.rb
@@ -75,7 +75,7 @@ def current_ability
 
     def render_single_use_error(exception)
       logger.error("Rendering PAGE due to exception: #{exception.inspect} - #{exception.backtrace if exception.respond_to? :backtrace}")
-      render 'single_use_error', layout: "error", status: 404
+      render 'single_use_error', layout: "error", status: :not_found
     end
 
     def _prefixes
diff --git a/app/forms/hyrax/forms/widgets/admin_set_visibility.rb b/app/forms/hyrax/forms/widgets/admin_set_visibility.rb
index 7473452ee6..2d22dde951 100644
--- a/app/forms/hyrax/forms/widgets/admin_set_visibility.rb
+++ b/app/forms/hyrax/forms/widgets/admin_set_visibility.rb
@@ -6,7 +6,7 @@ class AdminSetVisibility
         # Visibility options for permission templates
         def options
           i18n_prefix = "hyrax.admin.admin_sets.form_visibility.visibility"
-          # Note: Visibility 'varies' = '' implies no constraints
+          # NOTE: Visibility 'varies' = '' implies no constraints
           [[Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, I18n.t('.everyone', scope: i18n_prefix)],
            ['', I18n.t('.varies', scope: i18n_prefix)],
            [Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED, I18n.t('.institution', scope: i18n_prefix)],
diff --git a/app/jobs/import_url_job.rb b/app/jobs/import_url_job.rb
index 394e6dcb4d..e8e81324d6 100644
--- a/app/jobs/import_url_job.rb
+++ b/app/jobs/import_url_job.rb
@@ -80,12 +80,10 @@ def copy_remote_file(name)
     Rails.logger.debug("ImportUrlJob: Copying <#{uri}> to #{dir}")
 
     File.open(File.join(dir, filename), 'wb') do |f|
-      begin
-        write_file(f)
-        yield f
-      rescue StandardError => e
-        send_error(e.message)
-      end
+      write_file(f)
+      yield f
+    rescue StandardError => e
+      send_error(e.message)
     end
     Rails.logger.debug("ImportUrlJob: Closing #{File.join(dir, filename)}")
   end
diff --git a/app/models/concerns/hyrax/collection_behavior.rb b/app/models/concerns/hyrax/collection_behavior.rb
index 40701c49b4..041a61b067 100644
--- a/app/models/concerns/hyrax/collection_behavior.rb
+++ b/app/models/concerns/hyrax/collection_behavior.rb
@@ -87,7 +87,7 @@ def to_s
 
     module ClassMethods
       # This governs which partial to draw when you render this type of object
-      def _to_partial_path #:nodoc:
+      def _to_partial_path # :nodoc:
         @_to_partial_path ||= begin
           element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(name))
           collection = ActiveSupport::Inflector.tableize(name)
diff --git a/app/models/concerns/hyrax/work_behavior.rb b/app/models/concerns/hyrax/work_behavior.rb
index 8f44eed930..9f3ad3c5f0 100644
--- a/app/models/concerns/hyrax/work_behavior.rb
+++ b/app/models/concerns/hyrax/work_behavior.rb
@@ -34,7 +34,7 @@ module WorkBehavior
 
     module ClassMethods
       # This governs which partial to draw when you render this type of object
-      def _to_partial_path #:nodoc:
+      def _to_partial_path # :nodoc:
         @_to_partial_path ||= begin
           element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(name))
           collection = ActiveSupport::Inflector.tableize(name)
diff --git a/app/models/hyrax/file_set.rb b/app/models/hyrax/file_set.rb
index 28edc6711e..f0a03bee78 100644
--- a/app/models/hyrax/file_set.rb
+++ b/app/models/hyrax/file_set.rb
@@ -34,9 +34,7 @@ class FileSet < Hyrax::Resource
     include Hyrax::Schema(:basic_metadata)
 
     def self.model_name(name_class: Hyrax::Name)
-      @_model_name ||= begin
-        name_class.new(self, nil, 'FileSet')
-      end
+      @_model_name ||= name_class.new(self, nil, 'FileSet')
     end
 
     class_attribute :characterization_proxy
diff --git a/app/models/job_io_wrapper.rb b/app/models/job_io_wrapper.rb
index 03eb31084b..886a84ced2 100644
--- a/app/models/job_io_wrapper.rb
+++ b/app/models/job_io_wrapper.rb
@@ -94,7 +94,7 @@ def file
 
   def extracted_original_name
     eon = uploaded_file.uploader.filename if uploaded_file
-    eon ||= File.basename(path) if path.present? # note: uploader.filename is `nil` with uncached remote files (e.g. AWSFile)
+    eon ||= File.basename(path) if path.present? # NOTE: uploader.filename is `nil` with uncached remote files (e.g. AWSFile)
     eon
   end
 
diff --git a/app/presenters/hyrax/member_presenter_factory.rb b/app/presenters/hyrax/member_presenter_factory.rb
index 017cc74fa8..877c76c56e 100644
--- a/app/presenters/hyrax/member_presenter_factory.rb
+++ b/app/presenters/hyrax/member_presenter_factory.rb
@@ -47,13 +47,11 @@ def ordered_ids
     # in order.
     # Arbitrarily maxed at 10 thousand; had to specify rows due to solr's default of 10
     def file_set_ids
-      @file_set_ids ||= begin
-                          Hyrax::SolrService.query("{!field f=has_model_ssim}FileSet",
+      @file_set_ids ||= Hyrax::SolrService.query("{!field f=has_model_ssim}FileSet",
                                                    rows: 10_000,
                                                    fl: Hyrax.config.id_field,
                                                    fq: "{!join from=ordered_targets_ssim to=id}id:\"#{id}/list_source\"")
-                                            .flat_map { |x| x.fetch(Hyrax.config.id_field, []) }
-                        end
+                                          .flat_map { |x| x.fetch(Hyrax.config.id_field, []) }
     end
 
     def presenter_factory_arguments
diff --git a/app/services/hyrax/adapters/nesting_index_adapter.rb b/app/services/hyrax/adapters/nesting_index_adapter.rb
index b7ac0eb234..0c0d425ab5 100644
--- a/app/services/hyrax/adapters/nesting_index_adapter.rb
+++ b/app/services/hyrax/adapters/nesting_index_adapter.rb
@@ -60,7 +60,7 @@ def self.each_perservation_document_id_and_parent_ids(&block) # rubocop:disable
           object = ActiveFedora::Base.find(id)
           parent_ids = object.try(:member_of_collection_ids) || []
 
-          # note: we do not yield when the object has parents. Calling the nested indexer for the
+          # NOTE: we do not yield when the object has parents. Calling the nested indexer for the
           # top id will reindex all descendants as well.
           if object.try(:use_nested_reindexing?)
             yield(id, parent_ids) if parent_ids.empty?
@@ -119,11 +119,11 @@ def self.add_nesting_attributes(solr_doc:, ancestors:, parent_ids:, pathnames:,
       # @yield Samvera::NestingIndexer::Documents::IndexDocument
       #
       # @return [void]
-      def self.each_child_document_of(document:, extent:, &block)
+      def self.each_child_document_of(document:, extent:, &block) # rubocop:disable Lint/UnusedMethodArgument
         raw_child_solr_documents_of(parent_document: document).each do |solr_document|
           child_document = coerce_solr_document_to_index_document(original_solr_document: solr_document, id: solr_document.fetch('id'))
           # during light reindexing, we want to reindex the child only if fields aren't already there
-          block.call(child_document) if full_reindex?(extent: extent) || child_document.pathnames.empty?
+          yield(child_document) if full_reindex?(extent: extent) || child_document.pathnames.empty?
         end
       end
 
diff --git a/app/services/hyrax/characterization/valkyrie_characterization_service.rb b/app/services/hyrax/characterization/valkyrie_characterization_service.rb
index c1fdfd4430..e8c2b4fdae 100644
--- a/app/services/hyrax/characterization/valkyrie_characterization_service.rb
+++ b/app/services/hyrax/characterization/valkyrie_characterization_service.rb
@@ -91,11 +91,9 @@ def characterization_terms(doc)
     h = {}
 
     doc.class.terminology.terms.each_pair do |key, _target|
-      begin
-        h[key] = doc.public_send(key)
-      rescue NoMethodError
-        next
-      end
+      h[key] = doc.public_send(key)
+    rescue NoMethodError
+      next
     end
 
     h.compact
diff --git a/app/services/hyrax/collections/collection_member_service.rb b/app/services/hyrax/collections/collection_member_service.rb
index 522d10e128..a141b6ce33 100644
--- a/app/services/hyrax/collections/collection_member_service.rb
+++ b/app/services/hyrax/collections/collection_member_service.rb
@@ -83,11 +83,9 @@ def add_members_by_ids(collection_id:, new_member_ids:, user:)
         def add_members(collection_id:, new_members:, user:)
           messages = []
           new_members.map do |new_member|
-            begin
-              add_member(collection_id: collection_id, new_member: new_member, user: user)
-            rescue Hyrax::SingleMembershipError => err
-              messages += [err.message]
-            end
+            add_member(collection_id: collection_id, new_member: new_member, user: user)
+          rescue Hyrax::SingleMembershipError => err
+            messages += [err.message]
           end
           raise Hyrax::SingleMembershipError, messages if messages.present?
         end
diff --git a/app/services/hyrax/listeners/member_cleanup_listener.rb b/app/services/hyrax/listeners/member_cleanup_listener.rb
index 9df046d276..9f7cf7609a 100644
--- a/app/services/hyrax/listeners/member_cleanup_listener.rb
+++ b/app/services/hyrax/listeners/member_cleanup_listener.rb
@@ -13,15 +13,13 @@ def on_object_deleted(event)
         return if event[:object].is_a?(ActiveFedora::Base) # handled by legacy code
 
         Hyrax.custom_queries.find_child_file_sets(resource: event[:object]).each do |file_set|
-          begin
-            Hyrax.persister.delete(resource: file_set)
-            Hyrax.publisher
-                 .publish('object.deleted', object: file_set, id: file_set.id, user: event[:user])
-          rescue StandardError # we don't uncaught errors looping filesets
-            Hyrax.logger.warn "Failed to delete #{file_set.class}:#{file_set.id} " \
-                              "during cleanup for resource: #{event[:object]}. " \
-                              'This member may now be orphaned.'
-          end
+          Hyrax.persister.delete(resource: file_set)
+          Hyrax.publisher
+               .publish('object.deleted', object: file_set, id: file_set.id, user: event[:user])
+        rescue StandardError # we don't uncaught errors looping filesets
+          Hyrax.logger.warn "Failed to delete #{file_set.class}:#{file_set.id} " \
+                            "during cleanup for resource: #{event[:object]}. " \
+                            'This member may now be orphaned.'
         end
       end
 
@@ -33,15 +31,13 @@ def on_collection_deleted(event)
         return if event[:collection].is_a?(ActiveFedora::Base) # handled by legacy code
 
         Hyrax.custom_queries.find_members_of(collection: event[:collection]).each do |resource|
-          begin
-            resource.member_of_collection_ids -= [event[:collection].id]
-            Hyrax.persister.save(resource: resource)
-            Hyrax.publisher
-                 .publish('collection.membership.updated', collection: event[:collection], user: event[:user])
-          rescue StandardError
-            Hyrax.logger.warn "Failed to remove collection reference from #{work.class}:#{work.id} " \
-                              "during cleanup for collection: #{event[:collection]}. "
-          end
+          resource.member_of_collection_ids -= [event[:collection].id]
+          Hyrax.persister.save(resource: resource)
+          Hyrax.publisher
+               .publish('collection.membership.updated', collection: event[:collection], user: event[:user])
+        rescue StandardError
+          Hyrax.logger.warn "Failed to remove collection reference from #{work.class}:#{work.id} " \
+                            "during cleanup for collection: #{event[:collection]}. "
         end
       end
     end
diff --git a/app/services/hyrax/workflow/workflow_importer.rb b/app/services/hyrax/workflow/workflow_importer.rb
index 954d414585..a8b71eaf21 100644
--- a/app/services/hyrax/workflow/workflow_importer.rb
+++ b/app/services/hyrax/workflow/workflow_importer.rb
@@ -128,16 +128,14 @@ def validate!
       def call
         self.errors = []
         Array.wrap(data.fetch(:workflows)).map do |configuration|
-          begin
-            find_or_create_from(configuration: configuration)
-          rescue InvalidStateRemovalException => e
-            e.states.each do |state|
-              error = I18n.t('hyrax.workflow.load.state_error', workflow_name: state.workflow.name, state_name: state.name, entity_count: state.entities.count)
-              Rails.logger.error(error)
-              errors << error
-            end
-            Sipity::Workflow.find_by(name: configuration[:name])
+          find_or_create_from(configuration: configuration)
+        rescue InvalidStateRemovalException => e
+          e.states.each do |state|
+            error = I18n.t('hyrax.workflow.load.state_error', workflow_name: state.workflow.name, state_name: state.name, entity_count: state.entities.count)
+            Rails.logger.error(error)
+            errors << error
           end
+          Sipity::Workflow.find_by(name: configuration[:name])
         end
       end
 
diff --git a/app/services/hyrax/workflow/workflow_schema.rb b/app/services/hyrax/workflow/workflow_schema.rb
index 283ec2844a..9d1412ea89 100644
--- a/app/services/hyrax/workflow/workflow_schema.rb
+++ b/app/services/hyrax/workflow/workflow_schema.rb
@@ -20,11 +20,9 @@ class Types
         include Dry::Types()
 
         Constant = Types::Class.constructor do |v|
-          begin
-            v.constantize
-          rescue NameError => _err
-            v
-          end
+          v.constantize
+        rescue NameError => _err
+          v
         end
       end
 
diff --git a/app/strategies/hyrax/strategies/yaml_strategy.rb b/app/strategies/hyrax/strategies/yaml_strategy.rb
index bf5fa49825..1fe924d588 100644
--- a/app/strategies/hyrax/strategies/yaml_strategy.rb
+++ b/app/strategies/hyrax/strategies/yaml_strategy.rb
@@ -34,12 +34,10 @@ def key_exists?(feature)
 
     def yaml_file
       @yaml_file ||=
-        begin
-          if File.exist?(@config_file)
-            YAML.load_file(@config_file)
-          else
-            {}
-          end
+        if File.exist?(@config_file)
+          YAML.load_file(@config_file)
+        else
+          {}
         end
     end
   end
diff --git a/config/features.rb b/config/features.rb
index 90baa52cd2..4ab1f88558 100644
--- a/config/features.rb
+++ b/config/features.rb
@@ -1,53 +1,51 @@
 # frozen_string_literal: true
 Flipflop.configure do
-  begin
-    # Strategies will be used in the order listed here.
-    strategy :cookie
-    strategy :active_record, class: Hyrax::Feature
-    strategy Hyrax::Strategies::YamlStrategy, config: Hyrax.config.feature_config_path
-    strategy :default
-
-    feature :proxy_deposit,
-            default: true,
-            description: "Depositors may designate proxies to deposit works on their behalf"
-
-    feature :transfer_works,
-            default: true,
-            description: "Depositors may transfer their works to another user"
-
-    # Note, if this is deactivated, a default admin set will be created and all
-    # works will be assigned to it when they are created.
-    feature :assign_admin_set,
-            default: true,
-            description: "Ability to assign uploaded items to an admin set"
-
-    feature :show_deposit_agreement,
-            default: true,
-            description: "Show a deposit agreement to users creating works"
-
-    feature :active_deposit_agreement_acceptance,
-            default: Hyrax.config.active_deposit_agreement_acceptance?,
-            description: "Require an active acceptance of the deposit agreement by checking a checkbox"
-
-    feature :batch_upload,
-            default: false,
-            description: "Enable uploading batches of works"
-
-    feature :hide_private_items,
-            default: false,
-            description: "Do not show the private items."
-
-    feature :hide_users_list,
-            default: true,
-            description: "Do not show users list unless user has authenticated."
-
-    feature :cache_work_iiif_manifest,
-            default: false,
-            description: "Use Rails.cache to cache the JSON document for IIIF manifests"
-    feature :read_only,
-            default: false,
-            description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
-  rescue Flipflop::StrategyError, Flipflop::FeatureError => err
-    Rails.logger.warn "Ignoring #{err}: #{err.message}"
-  end
+  # Strategies will be used in the order listed here.
+  strategy :cookie
+  strategy :active_record, class: Hyrax::Feature
+  strategy Hyrax::Strategies::YamlStrategy, config: Hyrax.config.feature_config_path
+  strategy :default
+
+  feature :proxy_deposit,
+          default: true,
+          description: "Depositors may designate proxies to deposit works on their behalf"
+
+  feature :transfer_works,
+          default: true,
+          description: "Depositors may transfer their works to another user"
+
+  # Note, if this is deactivated, a default admin set will be created and all
+  # works will be assigned to it when they are created.
+  feature :assign_admin_set,
+          default: true,
+          description: "Ability to assign uploaded items to an admin set"
+
+  feature :show_deposit_agreement,
+          default: true,
+          description: "Show a deposit agreement to users creating works"
+
+  feature :active_deposit_agreement_acceptance,
+          default: Hyrax.config.active_deposit_agreement_acceptance?,
+          description: "Require an active acceptance of the deposit agreement by checking a checkbox"
+
+  feature :batch_upload,
+          default: false,
+          description: "Enable uploading batches of works"
+
+  feature :hide_private_items,
+          default: false,
+          description: "Do not show the private items."
+
+  feature :hide_users_list,
+          default: true,
+          description: "Do not show users list unless user has authenticated."
+
+  feature :cache_work_iiif_manifest,
+          default: false,
+          description: "Use Rails.cache to cache the JSON document for IIIF manifests"
+  feature :read_only,
+          default: false,
+          description: "Put the system into read-only mode. Deposits, edits, approvals and anything that makes a change to the data will be disabled."
+rescue Flipflop::StrategyError, Flipflop::FeatureError => err
+  Rails.logger.warn "Ignoring #{err}: #{err.message}"
 end
diff --git a/hyrax.gemspec b/hyrax.gemspec
index 4e3c49f628..4700f379d5 100644
--- a/hyrax.gemspec
+++ b/hyrax.gemspec
@@ -26,7 +26,7 @@ SUMMARY
 
   spec.required_ruby_version = '>= 2.5'
 
-  # Note: rails does not follow sem-ver conventions, it's
+  # NOTE: rails does not follow sem-ver conventions, it's
   # minor version releases can include breaking changes; see
   # http://guides.rubyonrails.org/maintenance_policy.html
   spec.add_dependency 'rails', '~> 5.0'
@@ -106,7 +106,7 @@ SUMMARY
   spec.add_development_dependency 'i18n_yaml_sorter'
   spec.add_development_dependency 'rails-controller-testing', '~> 1'
   # the hyrax style guide is based on `bixby`. see `.rubocop.yml`
-  spec.add_development_dependency 'bixby', '~> 3.0', ">= 3.0.2"
+  spec.add_development_dependency 'bixby', '~> 4.0'
   spec.add_development_dependency 'shoulda-callback-matchers', '~> 1.1.1'
   spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
   spec.add_development_dependency 'webdrivers', '~> 4.4'
diff --git a/lib/wings/services/custom_queries/find_file_metadata.rb b/lib/wings/services/custom_queries/find_file_metadata.rb
index 58aa8dddd3..5ef28ec2fb 100644
--- a/lib/wings/services/custom_queries/find_file_metadata.rb
+++ b/lib/wings/services/custom_queries/find_file_metadata.rb
@@ -73,11 +73,9 @@ def find_file_metadata_by_alternate_identifier(alternate_identifier:, use_valkyr
       #   if there are no ids or none of the ids map to Hyrax::FileMetadata
       def find_many_file_metadata_by_ids(ids:, use_valkyrie: true)
         ids.each_with_object([]) do |alt_id, results|
-          begin
-            results << find_file_metadata_by_alternate_identifier(alternate_identifier: alt_id, use_valkyrie: use_valkyrie)
-          rescue Hyrax::ObjectNotFoundError
-            next
-          end
+          results << find_file_metadata_by_alternate_identifier(alternate_identifier: alt_id, use_valkyrie: use_valkyrie)
+        rescue Hyrax::ObjectNotFoundError
+          next
         end
       end
 
diff --git a/lib/wings/valkyrie/query_service.rb b/lib/wings/valkyrie/query_service.rb
index db924e8393..6fb95c48d0 100644
--- a/lib/wings/valkyrie/query_service.rb
+++ b/lib/wings/valkyrie/query_service.rb
@@ -86,12 +86,10 @@ def find_many_by_ids(ids:)
         return enum_for(:find_many_by_ids, ids: ids) unless block_given?
 
         ids.map(&:to_s).uniq.each do |id|
-          begin
-            af_object = ActiveFedora::Base.find(id)
-            yield resource_factory.to_resource(object: af_object)
-          rescue ::ActiveFedora::ObjectNotFoundError, Ldp::Gone
-            next
-          end
+          af_object = ActiveFedora::Base.find(id)
+          yield resource_factory.to_resource(object: af_object)
+        rescue ::ActiveFedora::ObjectNotFoundError, Ldp::Gone
+          next
         end
       end
 
diff --git a/spec/controllers/concerns/hyrax/works_controller_behavior_spec.rb b/spec/controllers/concerns/hyrax/works_controller_behavior_spec.rb
index 0fe70d0b69..1e2aca2d3a 100644
--- a/spec/controllers/concerns/hyrax/works_controller_behavior_spec.rb
+++ b/spec/controllers/concerns/hyrax/works_controller_behavior_spec.rb
@@ -24,7 +24,7 @@
       .to receive(:registered_curation_concern_types)
       .and_return([work.model_name.name])
 
-    # note: we can't run jobs that rely on routes (i.e. those that send notifications)
+    # NOTE: we can't run jobs that rely on routes (i.e. those that send notifications)
     # from here because of this stubbing. it's proabably best just to not do that
     # anyway. if these tests depend on specific job behavior, they may be testing too
     # much.
diff --git a/spec/helpers/hyrax/embargo_helper_spec.rb b/spec/helpers/hyrax/embargo_helper_spec.rb
index 9ed5ec58e9..afaa83b5a1 100644
--- a/spec/helpers/hyrax/embargo_helper_spec.rb
+++ b/spec/helpers/hyrax/embargo_helper_spec.rb
@@ -13,7 +13,7 @@
       before { Hyrax::EmbargoManager.apply_embargo_for!(resource: resource) }
 
       it 'returns false' do
-        # Note: This spec echoes "embargo_enforced? with a Hyrax::Work when an embargo is enforced on the resource"
+        # NOTE: This spec echoes "embargo_enforced? with a Hyrax::Work when an embargo is enforced on the resource"
         allow(resource).to receive(:persisted?).and_return false
         expect(embargo_enforced?(resource)).to be false
       end
diff --git a/spec/helpers/hyrax/lease_helper_spec.rb b/spec/helpers/hyrax/lease_helper_spec.rb
index 84de922703..2663badef0 100644
--- a/spec/helpers/hyrax/lease_helper_spec.rb
+++ b/spec/helpers/hyrax/lease_helper_spec.rb
@@ -13,7 +13,7 @@
       before { Hyrax::LeaseManager.apply_lease_for!(resource: resource) }
 
       it 'returns false' do
-        # Note: This spec echoes "lease_enforced? with a Hyrax::Work when a lease is enforced on the resource"
+        # NOTE: This spec echoes "lease_enforced? with a Hyrax::Work when a lease is enforced on the resource"
         allow(resource).to receive(:persisted?).and_return false
         expect(lease_enforced?(resource)).to be false
       end
diff --git a/spec/indexers/hyrax/valkyrie_work_indexer_spec.rb b/spec/indexers/hyrax/valkyrie_work_indexer_spec.rb
index 71c7c7d012..fc4a1ee78c 100644
--- a/spec/indexers/hyrax/valkyrie_work_indexer_spec.rb
+++ b/spec/indexers/hyrax/valkyrie_work_indexer_spec.rb
@@ -36,6 +36,7 @@ module Custom
           class Work < Hyrax::Work
             attribute :broader, Valkyrie::Types::Array.of(Valkyrie::Types::String)
           end
+
           class WorkIndexer < Hyrax::ValkyrieWorkIndexer
             def to_solr
               super.tap do |solr_doc|
diff --git a/spec/models/hyrax/change_set_spec.rb b/spec/models/hyrax/change_set_spec.rb
index 993a45a1a0..2d67aa4ca1 100644
--- a/spec/models/hyrax/change_set_spec.rb
+++ b/spec/models/hyrax/change_set_spec.rb
@@ -75,14 +75,14 @@
           book
         end
         it 'passes validation' do
-          # NOTE isbn has validation presence: true
+          # NOTE: isbn has validation presence: true
           expect(subject.valid?).to eq true
         end
       end
 
       context 'and value for custom validation is incorrect' do
         it 'passes validation' do
-          # NOTE isbn has validation presence: true
+          # NOTE: isbn has validation presence: true
           expect(subject.valid?).to eq false
         end
       end
diff --git a/spec/services/hyrax/collection_types/create_service_spec.rb b/spec/services/hyrax/collection_types/create_service_spec.rb
index d3bfc19e82..691f614b83 100644
--- a/spec/services/hyrax/collection_types/create_service_spec.rb
+++ b/spec/services/hyrax/collection_types/create_service_spec.rb
@@ -116,11 +116,9 @@
 
       it 'does not add participants' do
         expect do
-          begin
-            described_class.add_participants(coltype.id, participants)
-          rescue described_class::InvalidParticipantError
-            nil
-          end
+          described_class.add_participants(coltype.id, participants)
+        rescue described_class::InvalidParticipantError
+          nil
         end.not_to change { Hyrax::CollectionType.find(coltype.id).collection_type_participants.to_a }
       end
     end
diff --git a/spec/views/hyrax/my/facet.html.erb_spec.rb b/spec/views/hyrax/my/facet.html.erb_spec.rb
index afcc57bceb..1b39d82575 100644
--- a/spec/views/hyrax/my/facet.html.erb_spec.rb
+++ b/spec/views/hyrax/my/facet.html.erb_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Note: this is a direct copy of the corresponding test in Blacklight
+# NOTE: this is a direct copy of the corresponding test in Blacklight
 # with changes for "views/my" instead of "views/catalog"
 
 RSpec.describe "hyrax/my/facet.html.erb", type: :view do