diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index d682d7ee..c77d83bb 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -1,16 +1,24 @@
 class DashboardController < ApplicationController
   def index
     authenticate(district.name.downcase, "#{district.name.downcase}!")
-    @measure_graph_row_presenters = Measure.where(measure_id: '1A-i').map do | measure |
-      MeasureGraphRowPresenter.new(
-        measure: measure,
-        score: SurveyResponseAggregator.score(school: school, academic_year: academic_year, measure: measure)
-      )
-    end
+    @measure_graph_row_presenters = measure_ids
+                                      .map { |measure_id| Measure.find_by_measure_id measure_id }
+                                      .map(&method(:presenter_for_measure))
   end
 
   private
 
+  def measure_ids
+    %w(1A-i)
+  end
+
+  def presenter_for_measure(measure)
+    MeasureGraphRowPresenter.new(
+      measure: measure,
+      score: SurveyResponseAggregator.score(school: school, academic_year: academic_year, measure: measure)
+    )
+  end
+
   def school
     @school ||= School.find_by_slug school_slug
   end