diff --git a/rcl/src/rcl/client.c b/rcl/src/rcl/client.c
index 184623e..1330b91 100644
--- a/rcl/src/rcl/client.c
+++ b/rcl/src/rcl/client.c
@@ -211,9 +211,7 @@ rcl_client_get_service_name(const rcl_client_t * client)
   return client->impl->rmw_handle->service_name;
 }
 
-/* *INDENT-OFF* */
-#define _client_get_options(client) &client->impl->options;
-/* *INDENT-ON* */
+#define _client_get_options(client) & client->impl->options;
 
 const rcl_client_options_t *
 rcl_client_get_options(const rcl_client_t * client)
diff --git a/rcl/src/rcl/publisher.c b/rcl/src/rcl/publisher.c
index 58ee9f3..44bc367 100644
--- a/rcl/src/rcl/publisher.c
+++ b/rcl/src/rcl/publisher.c
@@ -222,9 +222,7 @@ rcl_publisher_get_topic_name(const rcl_publisher_t * publisher)
   return publisher->impl->rmw_handle->topic_name;
 }
 
-/* *INDENT-OFF* */
-#define _publisher_get_options(pub) &pub->impl->options
-/* *INDENT-ON* */
+#define _publisher_get_options(pub) & pub->impl->options
 
 const rcl_publisher_options_t *
 rcl_publisher_get_options(const rcl_publisher_t * publisher)
diff --git a/rcl/src/rcl/service.c b/rcl/src/rcl/service.c
index a3c606f..db46edd 100644
--- a/rcl/src/rcl/service.c
+++ b/rcl/src/rcl/service.c
@@ -217,9 +217,7 @@ rcl_service_get_service_name(const rcl_service_t * service)
   return service->impl->rmw_handle->service_name;
 }
 
-/* *INDENT-OFF* */
-#define _service_get_options(service) &service->impl->options
-/* *INDENT-ON* */
+#define _service_get_options(service) & service->impl->options
 
 const rcl_service_options_t *
 rcl_service_get_options(const rcl_service_t * service)
diff --git a/rcl/src/rcl/subscription.c b/rcl/src/rcl/subscription.c
index 0156236..b3d4d37 100644
--- a/rcl/src/rcl/subscription.c
+++ b/rcl/src/rcl/subscription.c
@@ -248,9 +248,7 @@ rcl_subscription_get_topic_name(const rcl_subscription_t * subscription)
   return subscription->impl->rmw_handle->topic_name;
 }
 
-/* *INDENT-OFF* */
-#define _subscription_get_options(subscription) &subscription->impl->options
-/* *INDENT-ON* */
+#define _subscription_get_options(subscription) & subscription->impl->options
 
 const rcl_subscription_options_t *
 rcl_subscription_get_options(const rcl_subscription_t * subscription)
diff --git a/rcl/test/memory_tools/test_memory_tools.cpp b/rcl/test/memory_tools/test_memory_tools.cpp
index 9030f18..ecbcf1a 100644
--- a/rcl/test/memory_tools/test_memory_tools.cpp
+++ b/rcl/test/memory_tools/test_memory_tools.cpp
@@ -20,22 +20,22 @@
  */
 TEST(TestMemoryTools, test_allocation_checking_tools) {
   size_t unexpected_mallocs = 0;
-  auto on_unexpected_malloc = (
+  auto on_unexpected_malloc =
     [&unexpected_mallocs]() {
       unexpected_mallocs++;
-    });
+    };
   set_on_unexpected_malloc_callback(on_unexpected_malloc);
   size_t unexpected_reallocs = 0;
-  auto on_unexpected_realloc = (
+  auto on_unexpected_realloc =
     [&unexpected_reallocs]() {
       unexpected_reallocs++;
-    });
+    };
   set_on_unexpected_realloc_callback(on_unexpected_realloc);
   size_t unexpected_frees = 0;
-  auto on_unexpected_free = (
+  auto on_unexpected_free =
     [&unexpected_frees]() {
       unexpected_frees++;
-    });
+    };
   set_on_unexpected_free_callback(on_unexpected_free);
   void * mem = nullptr;
   void * remem = nullptr;