diff --git a/r2r/src/lib.rs b/r2r/src/lib.rs
index 199407e..714fc5a 100644
--- a/r2r/src/lib.rs
+++ b/r2r/src/lib.rs
@@ -77,10 +77,10 @@ pub use error::{Error, Result};
 
 mod msg_types;
 pub use msg_types::generated_msgs::*;
-pub use msg_types::WrappedNativeMsg as NativeMsg;
-pub use msg_types::WrappedTypesupport;
-pub use msg_types::WrappedServiceTypeSupport;
 pub use msg_types::WrappedActionTypeSupport;
+pub use msg_types::WrappedNativeMsg as NativeMsg;
+pub use msg_types::WrappedServiceTypeSupport;
+pub use msg_types::WrappedTypesupport;
 
 mod utils;
 pub use utils::*;
diff --git a/r2r_rcl/src/lib.rs b/r2r_rcl/src/lib.rs
index 57d4f5b..0c13ba5 100644
--- a/r2r_rcl/src/lib.rs
+++ b/r2r_rcl/src/lib.rs
@@ -125,16 +125,10 @@ macro_rules! primitive_sequence {
 primitive_sequence!(rosidl_runtime_c__float32, f32);
 primitive_sequence!(rosidl_runtime_c__float64, f64);
 
-#[cfg(any(
-  all(target_os = "macos", target_arch = "aarch64"),
-  target_arch = "arm"
-))]
+#[cfg(any(all(target_os = "macos", target_arch = "aarch64"), target_arch = "arm"))]
 primitive_sequence!(rosidl_runtime_c__long_double, f64);
 
-#[cfg(not(any(
-  all(target_os = "macos", target_arch = "aarch64"),
-  target_arch = "arm"
-)))]
+#[cfg(not(any(all(target_os = "macos", target_arch = "aarch64"), target_arch = "arm")))]
 primitive_sequence!(rosidl_runtime_c__long_double, u128);
 
 primitive_sequence!(rosidl_runtime_c__char, i8);