diff --git a/y2022_bot3/joystick_reader.cc b/y2022_bot3/joystick_reader.cc
index 00a28be..67f8957 100644
--- a/y2022_bot3/joystick_reader.cc
+++ b/y2022_bot3/joystick_reader.cc
@@ -26,9 +26,7 @@
 using frc971::input::driver_station::JoystickAxis;
 using frc971::input::driver_station::POVLocation;
 
-namespace y2022_bot3 {
-namespace input {
-namespace joysticks {
+namespace y2022_bot3::input::joysticks {
 
 namespace superstructure = y2022_bot3::control_loops::superstructure;
 
@@ -101,9 +99,7 @@
   ::aos::Fetcher<superstructure::Status> superstructure_status_fetcher_;
 };
 
-}  // namespace joysticks
-}  // namespace input
-}  // namespace y2022_bot3
+}  // namespace y2022_bot3::input::joysticks
 
 int main(int argc, char **argv) {
   ::aos::InitGoogle(&argc, &argv);