diff --git a/src-colladmin/actions/ingest_batch_folders_action.rb b/src-colladmin/actions/ingest_batch_folders_action.rb
index cc433595..49eaba72 100644
--- a/src-colladmin/actions/ingest_batch_folders_action.rb
+++ b/src-colladmin/actions/ingest_batch_folders_action.rb
@@ -163,7 +163,6 @@ def empty?
   end
 
   def to_table
-    table = []
     bfs = @batch_folders.sort do |a, b|
       if a.status == b.status
         b.dtime <=> a.dtime
@@ -171,10 +170,7 @@ def to_table
         AdminTask.status_sort_val(a.status) <=> AdminTask.status_sort_val(b.status)
       end
     end
-    bfs.each do |bf|
-      table.append(bf.table_row)
-    end
-    table
+    bfs.map(&:table_row)
   end
 
   def apply_queue_list(queue_list)
diff --git a/src-colladmin/actions/ingest_job_manifest_action.rb b/src-colladmin/actions/ingest_job_manifest_action.rb
index 61b5fd67..273d9df6 100644
--- a/src-colladmin/actions/ingest_job_manifest_action.rb
+++ b/src-colladmin/actions/ingest_job_manifest_action.rb
@@ -80,11 +80,9 @@ def initialize(json)
   end
 
   def self.table_headers
-    arr = []
-    JobManifestEntry.placeholder.get_property_list.each do |sym|
-      arr.append(JobManifestEntry.placeholder.get_label(sym))
+    JobManifestEntry.placeholder.get_property_list.map do |sym|
+      JobManifestEntry.placeholder.get_label(sym)
     end
-    arr
   end
 
   def self.table_types
diff --git a/src-colladmin/actions/ingest_job_metadata_action.rb b/src-colladmin/actions/ingest_job_metadata_action.rb
index 12bc64f8..486b4bf0 100644
--- a/src-colladmin/actions/ingest_job_metadata_action.rb
+++ b/src-colladmin/actions/ingest_job_metadata_action.rb
@@ -92,10 +92,6 @@ def initialize(body)
   end
 
   def to_table
-    rows = []
-    @metadata.each do |jmr|
-      rows.append(jmr.to_table_row)
-    end
-    rows
+    @metadata.map(&:to_table_row)
   end
 end
diff --git a/src-colladmin/actions/opensearch_describe_action.rb b/src-colladmin/actions/opensearch_describe_action.rb
index be2e9a4c..ece5d714 100644
--- a/src-colladmin/actions/opensearch_describe_action.rb
+++ b/src-colladmin/actions/opensearch_describe_action.rb
@@ -71,7 +71,6 @@ def process_key(k, defstat)
   end
 
   def table_rows(_body)
-    rows = []
     oskeys = {}
 
     @fields.each_key do |k|
@@ -82,10 +81,9 @@ def table_rows(_body)
 
       oskeys[k] = process_key(k, 'WARN')
     end
-    oskeys.keys.sort.each do |k|
-      rows.append(oskeys[k])
+    oskeys.keys.sort.map do |k|
+      oskeys[k]
     end
-    rows
   end
 
   def has_table
diff --git a/src-colladmin/actions/replication_action.rb b/src-colladmin/actions/replication_action.rb
index 15b34c9c..bc34a071 100644
--- a/src-colladmin/actions/replication_action.rb
+++ b/src-colladmin/actions/replication_action.rb
@@ -38,9 +38,8 @@ def maintidlist_params(status)
   end
 
   def maintidlist_placeholders
-    placeholders = []
-    @myparams.fetch('maintidlist', '').split(',').each do |_id|
-      placeholders.append('?')
+    placeholders = @myparams.fetch('maintidlist', '').split(',').map do |_id|
+      '?'
     end
     placeholders.join(',')
   end
diff --git a/src-colladmin/actions/tag_action.rb b/src-colladmin/actions/tag_action.rb
index 9bd67f58..5534f0b5 100644
--- a/src-colladmin/actions/tag_action.rb
+++ b/src-colladmin/actions/tag_action.rb
@@ -236,11 +236,9 @@ def perform_action
   end
 
   def get_table_rows
-    rows = []
-    @instances.keys.sort.each do |k|
-      rows.append(@instances[k].table_row(self))
+    @instances.keys.sort.map do |k|
+      @instances[k].table_row(self)
     end
-    rows
   end
 
   def has_table
diff --git a/src-colladmin/actions/tag_uc3_action.rb b/src-colladmin/actions/tag_uc3_action.rb
index f1f3ee20..9d08dd83 100644
--- a/src-colladmin/actions/tag_uc3_action.rb
+++ b/src-colladmin/actions/tag_uc3_action.rb
@@ -173,11 +173,9 @@ def perform_action
   end
 
   def get_table_rows
-    rows = []
-    @instances.keys.sort.each do |k|
-      rows.append(@instances[k].table_row(self))
+    @instances.keys.sort.map do |k|
+      @instances[k].table_row(self)
     end
-    rows
   end
 
   def has_table
diff --git a/src-colladmin/lambda_function.rb b/src-colladmin/lambda_function.rb
index 350f306b..94dc603c 100644
--- a/src-colladmin/lambda_function.rb
+++ b/src-colladmin/lambda_function.rb
@@ -381,11 +381,9 @@ def get_actions_map
         actmap[path] = [] unless actmap.key?(path)
         actmap[path].push(act)
       end
-      maplist = []
-      actmap.keys.sort.each do |p|
-        maplist.push({ path: p, actions: actmap[p] })
+      actmap.keys.sort.map do |p|
+        { path: p, actions: actmap[p] }
       end
-      maplist
     end
   end
 end
diff --git a/src-colladmin/lib/acc_queue.rb b/src-colladmin/lib/acc_queue.rb
index 94517230..586793df 100644
--- a/src-colladmin/lib/acc_queue.rb
+++ b/src-colladmin/lib/acc_queue.rb
@@ -80,11 +80,9 @@ def initialize(json)
   end
 
   def self.table_headers
-    arr = []
-    AccQueueEntry.placeholder.get_property_list.each do |sym|
-      arr.append(AccQueueEntry.placeholder.get_label(sym))
+    AccQueueEntry.placeholder.get_property_list.map do |sym|
+      AccQueueEntry.placeholder.get_label(sym)
     end
-    arr
   end
 
   def self.table_types
diff --git a/src-colladmin/lib/admin_objects.rb b/src-colladmin/lib/admin_objects.rb
index 0e56fd7b..196a3798 100644
--- a/src-colladmin/lib/admin_objects.rb
+++ b/src-colladmin/lib/admin_objects.rb
@@ -261,13 +261,7 @@ def self.table_types
   end
 
   def table_rows
-    rows = []
-    @profiles.each do |p|
-      rows.push(
-        p.to_table_row
-      )
-    end
-    rows
+    @profiles.map(&:to_table_row)
   end
 
   attr_reader :profiles
diff --git a/src-colladmin/lib/inv_queue.rb b/src-colladmin/lib/inv_queue.rb
index 1670aee0..97e36901 100644
--- a/src-colladmin/lib/inv_queue.rb
+++ b/src-colladmin/lib/inv_queue.rb
@@ -69,11 +69,9 @@ def initialize(json)
   end
 
   def self.table_headers
-    arr = []
-    InvQueueEntry.placeholder.get_property_list.each do |sym|
-      arr.append(InvQueueEntry.placeholder.get_label(sym))
+    InvQueueEntry.placeholder.get_property_list.map do |sym|
+      InvQueueEntry.placeholder.get_label(sym)
     end
-    arr
   end
 
   def self.table_types
diff --git a/src-colladmin/lib/lock.rb b/src-colladmin/lib/lock.rb
index 54288248..2f47cfa5 100644
--- a/src-colladmin/lib/lock.rb
+++ b/src-colladmin/lib/lock.rb
@@ -25,11 +25,9 @@ def initialize(json)
   end
 
   def self.table_headers
-    arr = []
-    LockEntry.placeholder.get_property_list.each do |sym|
-      arr.append(LockEntry.placeholder.get_label(sym))
+    LockEntry.placeholder.get_property_list.map do |sym|
+      LockEntry.placeholder.get_label(sym)
     end
-    arr
   end
 
   def self.table_types
diff --git a/src-colladmin/lib/profile.rb b/src-colladmin/lib/profile.rb
index eb0b0c73..7aec8450 100644
--- a/src-colladmin/lib/profile.rb
+++ b/src-colladmin/lib/profile.rb
@@ -28,12 +28,7 @@ def initialize(body, collections)
   end
 
   def table_rows
-    rows = []
-    @profiles.each do |p|
-      # next if p.is_template?
-      rows.append(p.summary_values)
-    end
-    rows
+    @profiles.map(&:summary_values)
   end
 
   def notification_map
@@ -41,14 +36,12 @@ def notification_map
     @profiles.each do |p|
       map[p.get_value(:context)] = p.get_value(:contactsEmail).join(',')
     end
-    omap = []
-    map.keys.sort.each do |k|
-      omap.push({
+    map.keys.sort.map do |k|
+      {
         mnemonic: k,
         contacts: map[k]
-      })
+      }
     end
-    omap
   end
 
   def recent_profiles
@@ -60,14 +53,12 @@ def recent_profiles
         context: p.get_value(:context)
       }
     end
-    omap = []
-    map.keys.sort.reverse.each do |k|
-      omap.push({
+    map.keys.sort.reverse.map do |k|
+      {
         ark: map[k][:ark],
         name: "#{map[k][:context]}: #{map[k][:name]}"
-      })
+      }
     end
-    omap
   end
 
   attr_reader :profiles
@@ -330,9 +321,8 @@ def summary_types
   end
 
   def summary_headers
-    arr = []
-    summary_symbols.each do |sym|
-      arr.append(get_label(sym))
+    arr = summary_symbols.map do |sym|
+      get_label(sym)
     end
     arr.append('Score')
     arr.append('Collection')
diff --git a/src-colladmin/lib/queue.rb b/src-colladmin/lib/queue.rb
index ac55a0b3..e6e73fe8 100644
--- a/src-colladmin/lib/queue.rb
+++ b/src-colladmin/lib/queue.rb
@@ -102,11 +102,9 @@ def check_filter(filter)
   end
 
   def self.table_headers
-    arr = []
-    QueueEntry.placeholder.get_property_list.each do |sym|
-      arr.append(QueueEntry.placeholder.get_label(sym))
+    QueueEntry.placeholder.get_property_list.map do |sym|
+      QueueEntry.placeholder.get_label(sym)
     end
-    arr
   end
 
   def self.table_types
diff --git a/src-colladmin/lib/storage_nodes.rb b/src-colladmin/lib/storage_nodes.rb
index 96ed7a57..fa13e886 100644
--- a/src-colladmin/lib/storage_nodes.rb
+++ b/src-colladmin/lib/storage_nodes.rb
@@ -841,18 +841,16 @@ def owner_clause
   end
 
   def search
-    objects = []
-    params = []
-    @norm_search.each do |p|
-      params.append(p)
+    params = @norm_search.map do |p|
+      p
     end
     params.push(@owner) unless @owner.empty?
 
     run_query(
       get_sql,
       params
-    ).each do |r|
-      objects.push({
+    ).map do |r|
+      {
         coll: r[0],
         owner: r[1],
         id: r[2],
@@ -867,17 +865,15 @@ def search
         file_count_fmt: MerrittQuery.num_format(r[10]),
         billable_size: r[11].nil? ? 0 : r[11],
         billable_size_fmt: MerrittQuery.num_format(r[11].nil? ? 0 : r[11])
-      })
+      }
     end
-    objects
   end
 
   attr_reader :objects
 
   def get_placeholders
-    p = []
-    @norm_search.each do |_s|
-      p.append('?')
+    p = @norm_search.map do |_s|
+      '?'
     end
     p.join(',')
   end