diff --git a/y2014_bot3/joystick_reader.cc b/y2014_bot3/joystick_reader.cc
index 0c48552..98ade64 100644
--- a/y2014_bot3/joystick_reader.cc
+++ b/y2014_bot3/joystick_reader.cc
@@ -22,9 +22,7 @@
 using ::frc971::input::driver_station::JoystickAxis;
 using ::frc971::input::driver_station::POVLocation;
 
-namespace y2014_bot3 {
-namespace input {
-namespace joysticks {
+namespace y2014_bot3::input::joysticks {
 
 // Joystick & button addresses.
 const JoystickAxis kSteeringWheel(1, 1), kDriveThrottle(2, 2);
@@ -133,9 +131,7 @@
   ::frc971::autonomous::BaseAutonomousActor::Factory autonomous_action_factory_;
 };
 
-}  // namespace joysticks
-}  // namespace input
-}  // namespace y2014_bot3
+}  // namespace y2014_bot3::input::joysticks
 
 int main(int argc, char **argv) {
   ::aos::InitGoogle(&argc, &argv);