diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index 53e7c3c901f..1aa2b0961e5 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -341,7 +341,7 @@ class MachCommands(CommandBase):
 
             clangfmt_failed = False
             if not no_cpp:
-                available, cmd, files = setup_clangfmt(all_files)
+                available, cmd, files = setup_clangfmt()
                 if available:
                     for file in files:
                         stdout = subprocess.check_output([cmd, "-output-replacements-xml", file])
@@ -480,7 +480,7 @@ class MachCommands(CommandBase):
     def format_code(self, no_cpp):
 
         if not no_cpp:
-            available, cmd, files = setup_clangfmt(True)
+            available, cmd, files = setup_clangfmt()
             if available and len(files) > 0:
                 check_call([cmd, "-i"] + files)
 
@@ -797,7 +797,7 @@ def create_parser_create():
     return p
 
 
-def setup_clangfmt(all_files):
+def setup_clangfmt():
     cmd = "clang-format.exe" if sys.platform == "win32" else "clang-format"
     try:
         version = subprocess.check_output([cmd, "--version"]).rstrip()
@@ -809,8 +809,6 @@ def setup_clangfmt(all_files):
         print("clang-format not installed. Skipping CPP formatting.")
         return False, None, None
     gitcmd = ['git', 'ls-files']
-    if not all_files:
-        gitcmd.append('-m')
     gitfiles = subprocess.check_output(gitcmd + CLANGFMT_CPP_DIRS).splitlines()
     filtered = [line for line in gitfiles if line.endswith(".h") or line.endswith(".cpp")]
     return True, cmd, filtered
diff --git a/support/hololens/ServoApp/ServoControl/Servo.h b/support/hololens/ServoApp/ServoControl/Servo.h
index 3cf3bc63d93..b89ca1c8d76 100644
--- a/support/hololens/ServoApp/ServoControl/Servo.h
+++ b/support/hololens/ServoApp/ServoControl/Servo.h
@@ -62,9 +62,7 @@ public:
   void MouseUp(float x, float y, capi::CMouseButton b) {
     capi::mouse_up(x, y, b);
   }
-  void MouseMove(float x, float y) {
-    capi::mouse_move(x, y);
-  }
+  void MouseMove(float x, float y) { capi::mouse_move(x, y); }
 
   void Reload() { capi::reload(); }
   void Stop() { capi::stop(); }
diff --git a/support/hololens/ServoApp/ServoControl/ServoControl.cpp b/support/hololens/ServoApp/ServoControl/ServoControl.cpp
index 9e7323ae8f2..c8444b57d2d 100644
--- a/support/hololens/ServoApp/ServoControl/ServoControl.cpp
+++ b/support/hololens/ServoApp/ServoControl/ServoControl.cpp
@@ -149,7 +149,7 @@ void ServoControl::OnSurfacePointerPressed(
 
 void ServoControl::OnSurfacePointerCanceled(
     IInspectable const &, Input::PointerRoutedEventArgs const &e) {
-    mPressedMouseButton = {};
+  mPressedMouseButton = {};
 }
 
 void ServoControl::OnSurfacePointerMoved(