diff --git a/y2016/control_loops/superstructure/superstructure.cc b/y2016/control_loops/superstructure/superstructure.cc
index 0e97762..9b87ff9 100644
--- a/y2016/control_loops/superstructure/superstructure.cc
+++ b/y2016/control_loops/superstructure/superstructure.cc
@@ -15,7 +15,10 @@
 
 namespace {
 constexpr double kZeroingVoltage = 4.0;
+// The maximum voltage the intake roller will be allowed to use.
+constexpr float kMaxIntakeVoltage = 8.0;
 
+// Aliases to reduce typing.
 constexpr double kIntakeEncoderIndexDifference =
     constants::Values::kIntakeEncoderIndexDifference;
 constexpr double kWristEncoderIndexDifference =
@@ -540,8 +543,9 @@
     // Logic to run our rollers on the intake.
     output->voltage_rollers = 0.0;
     if (unsafe_goal) {
-      output->voltage_rollers =
-          ::std::max(-8.0, ::std::min(8.0, unsafe_goal->voltage_rollers));
+      output->voltage_rollers = ::std::max(
+          -kMaxIntakeVoltage,
+          ::std::min(unsafe_goal->voltage_rollers, kMaxIntakeVoltage));
     }
   }