diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index c92449cd047..53e7c3c901f 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -810,7 +810,7 @@ def setup_clangfmt(all_files):
         return False, None, None
     gitcmd = ['git', 'ls-files']
     if not all_files:
-            gitcmd.append('-m')
+        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/BrowserPage.cpp b/support/hololens/ServoApp/BrowserPage.cpp
index 61341dfcc29..a9de7e2942d 100644
--- a/support/hololens/ServoApp/BrowserPage.cpp
+++ b/support/hololens/ServoApp/BrowserPage.cpp
@@ -69,7 +69,7 @@ void BrowserPage::SetTransientMode(bool transient) {
   navigationBar().Visibility(transient ? Visibility::Collapsed
                                        : Visibility::Visible);
   transientLoadingIndicator().Visibility(transient ? Visibility::Visible
-                                            : Visibility::Collapsed);
+                                                   : Visibility::Collapsed);
 }
 
 void BrowserPage::SetArgs(hstring args) { servoControl().SetArgs(args); }
diff --git a/support/hololens/ServoApp/ServoControl/Servo.cpp b/support/hololens/ServoApp/ServoControl/Servo.cpp
index 17aeb0d64e6..8c66e8cdeb3 100644
--- a/support/hololens/ServoApp/ServoControl/Servo.cpp
+++ b/support/hololens/ServoApp/ServoControl/Servo.cpp
@@ -47,17 +47,17 @@ void on_ime_state_changed(bool aShow) {
   sServo->Delegate().OnServoIMEStateChanged(aShow);
 }
 
-void set_clipboard_contents(const char* content) {
+void set_clipboard_contents(const char *content) {
   // FIXME
 }
 
-const char* get_clipboard_contents() {
+const char *get_clipboard_contents() {
   // FIXME
   return nullptr;
 }
 
-Servo::Servo(hstring url, hstring args, GLsizei width, GLsizei height, float dpi,
-             ServoDelegate &aDelegate)
+Servo::Servo(hstring url, hstring args, GLsizei width, GLsizei height,
+             float dpi, ServoDelegate &aDelegate)
     : mWindowHeight(height), mWindowWidth(width), mDelegate(aDelegate) {
 
   capi::CInitOptions o;
@@ -73,22 +73,23 @@ Servo::Servo(hstring url, hstring args, GLsizei width, GLsizei height, float dpi
   // 7 filter modules.
   /* Sample list of servo modules to filter.
   static char *pfilters[] = {
-	  "servo",
-	  "simpleservo", 
-	  "simpleservo::jniapi",
-	  "simpleservo::gl_glue::egl",
-	  // Show JS errors by default.
-	  "script::dom::bindings::error",
-	  // Show GL errors by default.
-	  "canvas::webgl_thread",
-	  "compositing::compositor",
-	  "constellation::constellation",
+          "servo",
+          "simpleservo",
+          "simpleservo::jniapi",
+          "simpleservo::gl_glue::egl",
+          // Show JS errors by default.
+          "script::dom::bindings::error",
+          // Show GL errors by default.
+          "canvas::webgl_thread",
+          "compositing::compositor",
+          "constellation::constellation",
   };
   */
 
   // Example Call when *pfilters[] is used:
   // o.vslogger_mod_list = pfilters; // servo log modules
-  // o.vslogger_mod_size = sizeof(pfilters) / sizeof(pfilters[0]) -1; // Important: Number of modules in pfilters
+  // o.vslogger_mod_size = sizeof(pfilters) / sizeof(pfilters[0]) -1; //
+  // Important: Number of modules in pfilters
   o.vslogger_mod_list = NULL;
   o.vslogger_mod_size = 0;
 
@@ -135,7 +136,7 @@ std::unique_ptr<char *> hstring2char(hstring hstr) {
   char *str = new char[size];
   size_t converted = 0;
   wcstombs_s(&converted, str, size, wc, hstr.size());
-  return std::make_unique<char*>(str);
+  return std::make_unique<char *>(str);
 }
 
 } // namespace winrt::servo
diff --git a/support/hololens/ServoApp/ServoControl/ServoControl.cpp b/support/hololens/ServoApp/ServoControl/ServoControl.cpp
index 6c6fa094dad..84d86686a4e 100644
--- a/support/hololens/ServoApp/ServoControl/ServoControl.cpp
+++ b/support/hololens/ServoApp/ServoControl/ServoControl.cpp
@@ -203,8 +203,8 @@ void ServoControl::Loop() {
   if (mServo == nullptr) {
     log("Entering loop");
     ServoDelegate *sd = static_cast<ServoDelegate *>(this);
-    mServo = std::make_unique<Servo>(mInitialURL, mArgs, panelWidth, panelHeight, mDPI,
-                                     *sd);
+    mServo = std::make_unique<Servo>(mInitialURL, mArgs, panelWidth,
+                                     panelHeight, mDPI, *sd);
   } else {
     // FIXME: this will fail since create_task didn't pick the thread
     // where Servo was running initially.
diff --git a/support/hololens/ServoApp/ServoControl/ServoControl.h b/support/hololens/ServoApp/ServoControl/ServoControl.h
index aa58f2f6ee1..bb46e6b2860 100644
--- a/support/hololens/ServoApp/ServoControl/ServoControl.h
+++ b/support/hololens/ServoApp/ServoControl/ServoControl.h
@@ -118,12 +118,12 @@ private:
     }
   }
 
-  void
-  OnSurfaceTapped(IInspectable const &,
-                   Windows::UI::Xaml::Input::TappedRoutedEventArgs const &);
+  void OnSurfaceTapped(IInspectable const &,
+                       Windows::UI::Xaml::Input::TappedRoutedEventArgs const &);
 
-  void OnSurfacePointerPressed(IInspectable const &,
-                       Windows::UI::Xaml::Input::PointerRoutedEventArgs const &);
+  void OnSurfacePointerPressed(
+      IInspectable const &,
+      Windows::UI::Xaml::Input::PointerRoutedEventArgs const &);
 
   void OnSurfaceManipulationDelta(
       IInspectable const &,