diff --git a/alvr/client_openxr/src/extra_extensions/face_tracking_pico.rs b/alvr/client_openxr/src/extra_extensions/face_tracking_pico.rs
index 42c9f8f3b7..884a207336 100644
--- a/alvr/client_openxr/src/extra_extensions/face_tracking_pico.rs
+++ b/alvr/client_openxr/src/extra_extensions/face_tracking_pico.rs
@@ -1,10 +1,10 @@
-use openxr::{self as xr, sys};
-use std::{mem};
 use openxr::sys::pfn::VoidFunction;
+use openxr::{self as xr, sys};
+use std::mem;
 
-pub const TRACKING_MODE_FACE_BIT                  : u64 = 0x00000008;
-pub const TRACKING_MODE_FACE_LIPSYNC              : u64 = 0x00002000;
-pub const TRACKING_MODE_FACE_LIPSYNC_BLEND_SHAPES : u64 = 0x00000100;
+const TRACKING_MODE_FACE_BIT: u64 = 0x00000008;
+const TRACKING_MODE_FACE_LIPSYNC: u64 = 0x00002000;
+const TRACKING_MODE_FACE_LIPSYNC_BLEND_SHAPES: u64 = 0x00000100;
 
 #[repr(C)]
 struct FaceTrackingDataPICO {
@@ -16,14 +16,9 @@ struct FaceTrackingDataPICO {
     reserved: [f32; 128],
 }
 
-type StartEyeTrackingPICO = unsafe extern "system" fn(
-    sys::Session,
-) -> sys::Result;
+type StartEyeTrackingPICO = unsafe extern "system" fn(sys::Session) -> sys::Result;
 
-type SetTrackingModePICO = unsafe extern "system" fn(
-    sys::Session,
-    u64
-) -> sys::Result;
+type SetTrackingModePICO = unsafe extern "system" fn(sys::Session, u64) -> sys::Result;
 
 type GetFaceTrackingDataPICO = unsafe extern "system" fn(
     sys::Session,
@@ -56,13 +51,10 @@ impl FaceTrackerPico {
                 &mut get_face_tracking_data,
             );
 
-            get_face_tracking_data.map(|pfn| {
-                mem::transmute::<VoidFunction, GetFaceTrackingDataPICO>(
-                    pfn,
-                )
-            })
+            get_face_tracking_data
+                .map(|pfn| mem::transmute::<VoidFunction, GetFaceTrackingDataPICO>(pfn))
         }
-            .ok_or(sys::Result::ERROR_EXTENSION_NOT_PRESENT)?;
+        .ok_or(sys::Result::ERROR_EXTENSION_NOT_PRESENT)?;
 
         let start_eye_tracking = unsafe {
             let mut start_eye_tracking = None;
@@ -72,13 +64,9 @@ impl FaceTrackerPico {
                 &mut start_eye_tracking,
             );
 
-            start_eye_tracking.map(|pfn| {
-                mem::transmute::<VoidFunction, StartEyeTrackingPICO>(
-                    pfn,
-                )
-            })
+            start_eye_tracking.map(|pfn| mem::transmute::<VoidFunction, StartEyeTrackingPICO>(pfn))
         }
-            .ok_or(sys::Result::ERROR_EXTENSION_NOT_PRESENT)?;
+        .ok_or(sys::Result::ERROR_EXTENSION_NOT_PRESENT)?;
 
         let set_tracking_mode = unsafe {
             let mut set_tracking_mode = None;
@@ -88,19 +76,12 @@ impl FaceTrackerPico {
                 &mut set_tracking_mode,
             );
 
-            set_tracking_mode.map(|pfn| {
-                mem::transmute::<VoidFunction, SetTrackingModePICO>(
-                    pfn,
-                )
-            })
-        }
-            .ok_or(sys::Result::ERROR_EXTENSION_NOT_PRESENT)?;
-
-        unsafe {
-            super::xr_res(start_eye_tracking(session.as_raw()))?
+            set_tracking_mode.map(|pfn| mem::transmute::<VoidFunction, SetTrackingModePICO>(pfn))
         }
+        .ok_or(sys::Result::ERROR_EXTENSION_NOT_PRESENT)?;
 
         unsafe {
+            super::xr_res(start_eye_tracking(session.as_raw()))?;
             super::xr_res(set_tracking_mode(session.as_raw(), tracking_flags))?
         }
 
@@ -135,4 +116,4 @@ impl FaceTrackerPico {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/alvr/client_openxr/src/extra_extensions/mod.rs b/alvr/client_openxr/src/extra_extensions/mod.rs
index 96d03c7cf8..7827ed2366 100644
--- a/alvr/client_openxr/src/extra_extensions/mod.rs
+++ b/alvr/client_openxr/src/extra_extensions/mod.rs
@@ -2,21 +2,21 @@ mod body_tracking_fb;
 mod eye_gaze_interaction;
 mod eye_tracking_social;
 mod face_tracking2_fb;
+mod face_tracking_pico;
 mod facial_tracking_htc;
 mod multimodal_input;
 mod passthrough_fb;
 mod passthrough_htc;
-mod face_tracking_pico;
 
 pub use body_tracking_fb::*;
 pub use eye_gaze_interaction::*;
 pub use eye_tracking_social::*;
 pub use face_tracking2_fb::*;
+pub use face_tracking_pico::*;
 pub use facial_tracking_htc::*;
 pub use multimodal_input::*;
 pub use passthrough_fb::*;
 pub use passthrough_htc::*;
-pub use face_tracking_pico::*;
 
 use openxr::{self as xr, sys};
 
diff --git a/alvr/client_openxr/src/interaction.rs b/alvr/client_openxr/src/interaction.rs
index dbf219557b..e6366ef910 100644
--- a/alvr/client_openxr/src/interaction.rs
+++ b/alvr/client_openxr/src/interaction.rs
@@ -1,8 +1,7 @@
 use crate::{
     extra_extensions::{
-        self, BodyTrackerFB, EyeTrackerSocial, FaceTracker2FB,
-        FacialTrackerHTC, FaceTrackerPico, MultimodalMeta,
-        BODY_JOINT_SET_FULL_BODY_META, FULL_BODY_JOINT_COUNT_META,
+        self, BodyTrackerFB, EyeTrackerSocial, FaceTracker2FB, FaceTrackerPico, FacialTrackerHTC,
+        MultimodalMeta, BODY_JOINT_SET_FULL_BODY_META, FULL_BODY_JOINT_COUNT_META,
         FULL_BODY_JOINT_LEFT_FOOT_BALL_META, FULL_BODY_JOINT_LEFT_LOWER_LEG_META,
         FULL_BODY_JOINT_RIGHT_FOOT_BALL_META, FULL_BODY_JOINT_RIGHT_LOWER_LEG_META,
     },