diff --git a/y2018/control_loops/drivetrain/BUILD b/y2018/control_loops/drivetrain/BUILD
index 64fa16f..48bfeb0 100644
--- a/y2018/control_loops/drivetrain/BUILD
+++ b/y2018/control_loops/drivetrain/BUILD
@@ -1,76 +1,76 @@
-load('//aos/build:queues.bzl', 'queue_library')
+load("//aos/build:queues.bzl", "queue_library")
 
 genrule(
-  name = 'genrule_drivetrain',
-  cmd = '$(location //y2018/control_loops/python:drivetrain) $(OUTS)',
-  tools = [
-    '//y2018/control_loops/python:drivetrain',
-  ],
-  outs = [
-    'drivetrain_dog_motor_plant.h',
-    'drivetrain_dog_motor_plant.cc',
-    'kalman_drivetrain_motor_plant.h',
-    'kalman_drivetrain_motor_plant.cc',
-  ],
+    name = "genrule_drivetrain",
+    outs = [
+        "drivetrain_dog_motor_plant.h",
+        "drivetrain_dog_motor_plant.cc",
+        "kalman_drivetrain_motor_plant.h",
+        "kalman_drivetrain_motor_plant.cc",
+    ],
+    cmd = "$(location //y2018/control_loops/python:drivetrain) $(OUTS)",
+    tools = [
+        "//y2018/control_loops/python:drivetrain",
+    ],
 )
 
 genrule(
-  name = 'genrule_polydrivetrain',
-  cmd = '$(location //y2018/control_loops/python:polydrivetrain) $(OUTS)',
-  tools = [
-    '//y2018/control_loops/python:polydrivetrain',
-  ],
-  outs = [
-    'polydrivetrain_dog_motor_plant.h',
-    'polydrivetrain_dog_motor_plant.cc',
-    'polydrivetrain_cim_plant.h',
-    'polydrivetrain_cim_plant.cc',
-  ],
+    name = "genrule_polydrivetrain",
+    outs = [
+        "polydrivetrain_dog_motor_plant.h",
+        "polydrivetrain_dog_motor_plant.cc",
+        "polydrivetrain_cim_plant.h",
+        "polydrivetrain_cim_plant.cc",
+    ],
+    cmd = "$(location //y2018/control_loops/python:polydrivetrain) $(OUTS)",
+    tools = [
+        "//y2018/control_loops/python:polydrivetrain",
+    ],
 )
 
 cc_library(
-  name = 'polydrivetrain_plants',
-  visibility = ['//visibility:public'],
-  srcs = [
-    'polydrivetrain_dog_motor_plant.cc',
-    'drivetrain_dog_motor_plant.cc',
-    'kalman_drivetrain_motor_plant.cc',
-  ],
-  hdrs = [
-    'polydrivetrain_dog_motor_plant.h',
-    'drivetrain_dog_motor_plant.h',
-    'kalman_drivetrain_motor_plant.h',
-  ],
-  deps = [
-    '//frc971/control_loops:state_feedback_loop',
-  ],
+    name = "polydrivetrain_plants",
+    srcs = [
+        "drivetrain_dog_motor_plant.cc",
+        "kalman_drivetrain_motor_plant.cc",
+        "polydrivetrain_dog_motor_plant.cc",
+    ],
+    hdrs = [
+        "drivetrain_dog_motor_plant.h",
+        "kalman_drivetrain_motor_plant.h",
+        "polydrivetrain_dog_motor_plant.h",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//frc971/control_loops:state_feedback_loop",
+    ],
 )
 
 cc_library(
-  name = 'drivetrain_base',
-  visibility = ['//visibility:public'],
-  srcs = [
-    'drivetrain_base.cc',
-  ],
-  hdrs = [
-    'drivetrain_base.h',
-  ],
-  deps = [
-    ':polydrivetrain_plants',
-    '//frc971/control_loops/drivetrain:drivetrain_config',
-    '//frc971:shifter_hall_effect',
-  ],
+    name = "drivetrain_base",
+    srcs = [
+        "drivetrain_base.cc",
+    ],
+    hdrs = [
+        "drivetrain_base.h",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":polydrivetrain_plants",
+        "//frc971:shifter_hall_effect",
+        "//frc971/control_loops/drivetrain:drivetrain_config",
+    ],
 )
 
 cc_binary(
-  name = 'drivetrain',
-  visibility = ['//visibility:public'],
-  srcs = [
-    'drivetrain_main.cc',
-  ],
-  deps = [
-    ':drivetrain_base',
-    '//aos:init',
-    '//frc971/control_loops/drivetrain:drivetrain_lib',
-  ],
+    name = "drivetrain",
+    srcs = [
+        "drivetrain_main.cc",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":drivetrain_base",
+        "//aos:init",
+        "//frc971/control_loops/drivetrain:drivetrain_lib",
+    ],
 )
diff --git a/y2018/control_loops/python/BUILD b/y2018/control_loops/python/BUILD
index b454db5..db596ae 100644
--- a/y2018/control_loops/python/BUILD
+++ b/y2018/control_loops/python/BUILD
@@ -182,7 +182,6 @@
     legacy_create_init = False,
     restricted_to = ["//tools:k8"],
     srcs_version = "PY3",
-    restricted_to = ["//tools:k8"],
     deps = [
         ":basic_window",
         ":python_init",
@@ -211,8 +210,8 @@
     ],
     default_python_version = "PY3",
     legacy_create_init = False,
-    srcs_version = "PY3",
     restricted_to = ["//tools:k8"],
+    srcs_version = "PY3",
     deps = [
         ":basic_window",
         ":python_init",