Index: runtime/src/kmp_ftn_entry.h
===================================================================
--- runtime/src/kmp_ftn_entry.h
+++ runtime/src/kmp_ftn_entry.h
@@ -345,8 +345,7 @@
 }
 
 #if OMP_50_ENABLED
-int FTN_STDCALL FTN_CONTROL_TOOL(int command, int modifier,
-                                 void *arg) {
+int FTN_STDCALL FTN_CONTROL_TOOL(int command, int modifier, void *arg) {
 #if defined(KMP_STUB) || !OMPT_SUPPORT
   return -2;
 #else
Index: runtime/src/kmp_gsupport.cpp
===================================================================
--- runtime/src/kmp_gsupport.cpp
+++ runtime/src/kmp_gsupport.cpp
@@ -324,7 +324,7 @@
                                           enum sched_type schedule, long start,
                                           long end, long incr,
                                           long chunk_size) {
-// Intialize the loop worksharing construct.
+  // Intialize the loop worksharing construct.
 
   KMP_DISPATCH_INIT(loc, *gtid, schedule, start, end, incr, chunk_size,
                     schedule != kmp_sch_static);
Index: runtime/src/kmp_i18n.cpp
===================================================================
--- runtime/src/kmp_i18n.cpp
+++ runtime/src/kmp_i18n.cpp
@@ -823,7 +823,8 @@
     switch (message.type) {
     case kmp_mt_hint: {
       format = kmp_i18n_fmt_Hint;
-      // we cannot skip %1$ and only use %2$ to print the message without the number
+      // we cannot skip %1$ and only use %2$ to print the message without the
+      // number
       fmsg = __kmp_msg_format(format, message.str);
     } break;
     case kmp_mt_syserr: {
Index: runtime/src/kmp_taskdeps.cpp
===================================================================
--- runtime/src/kmp_taskdeps.cpp
+++ runtime/src/kmp_taskdeps.cpp
@@ -478,7 +478,8 @@
   if (ompt_enabled.enabled) {
     OMPT_STORE_RETURN_ADDRESS(gtid);
     if (!current_task->ompt_task_info.frame.enter_frame)
-      current_task->ompt_task_info.frame.enter_frame = OMPT_GET_FRAME_ADDRESS(1);
+      current_task->ompt_task_info.frame.enter_frame =
+          OMPT_GET_FRAME_ADDRESS(1);
     if (ompt_enabled.ompt_callback_task_create) {
       ompt_data_t task_data = ompt_data_none;
       ompt_callbacks.ompt_callback(ompt_callback_task_create)(
Index: runtime/src/ompt-general.cpp
===================================================================
--- runtime/src/ompt-general.cpp
+++ runtime/src/ompt-general.cpp
@@ -218,8 +218,8 @@
   const char *sep = ":";
 #endif
 
-  // Try in the current address space
 #if KMP_OS_DARWIN
+  // Try in the current address space
   ret = ompt_tool_darwin(omp_version, runtime_version);
 #elif OMPT_HAVE_WEAK_ATTRIBUTE
   ret = ompt_start_tool(omp_version, runtime_version);
@@ -501,7 +501,8 @@
  ****************************************************************************/
 
 OMPT_API_ROUTINE int ompt_get_num_procs(void) {
-// copied from kmp_ftn_entry.h (but modified: OMPT can only be called when runtime is initialized)
+  // copied from kmp_ftn_entry.h (but modified: OMPT can only be called when
+  // runtime is initialized)
   return __kmp_avail_proc;
 }