diff --git a/csvexport/src/csvexport.cpp b/csvexport/src/csvexport.cpp
index f2c793f1..50e5b1b9 100644
--- a/csvexport/src/csvexport.cpp
+++ b/csvexport/src/csvexport.cpp
@@ -253,127 +253,133 @@ int main(int argc, char** argv)
         std::this_thread::sleep_for(std::chrono::milliseconds(10));
     }
 
-   if(!args.show_gpu)
+   if (!args.show_gpu)
    {
         auto& slz = worker.GetSourceLocationZones();
-        tracy::Vector<decltype( slz.begin() )> slz_selected;
-        slz_selected.reserve( slz.size() );
+        tracy::Vector<decltype(slz.begin())> slz_selected;
+        slz_selected.reserve(slz.size());
 
         uint32_t total_cnt = 0;
-        for( auto it = slz.begin(); it != slz.end(); ++it )
+        for(auto it = slz.begin(); it != slz.end(); ++it)
         {
-            if( it->second.total != 0 )
+            if(it->second.total != 0)
             {
                 ++total_cnt;
-                if( args.filter[0] == '\0' )
+                if(args.filter[0] == '\0')
                 {
-                    slz_selected.push_back_no_space_check( it );
+                    slz_selected.push_back_no_space_check(it);
                 }
                 else
                 {
-                    auto name = get_name( it->first, worker );
-                    if( is_substring( args.filter, name, args.case_sensitive ) )
+                    auto name = get_name(it->first, worker);
+                    if(is_substring(args.filter, name, args.case_sensitive))
                     {
-                        slz_selected.push_back_no_space_check( it );
+                        slz_selected.push_back_no_space_check(it);
                     }
                 }
             }
         }
 
         std::vector<const char*> columns;
-        if( args.unwrap )
+        if (args.unwrap)
         {
-            columns = { "name", "src_file", "src_line", "ns_since_start", "exec_time_ns", "thread", "value" };
+            columns = {
+                "name", "src_file", "src_line", "ns_since_start", "exec_time_ns", "thread", "value"
+            };
         }
         else
         {
-            columns = { "name",   "src_file", "src_line", "total_ns", "total_perc",
-                        "counts", "mean_ns",  "min_ns",   "max_ns",   "std_ns" };
+            columns = {
+                "name", "src_file", "src_line", "total_ns", "total_perc",
+                "counts", "mean_ns", "min_ns", "max_ns", "std_ns"
+            };
         }
-        std::string header = join( columns, args.separator );
-        printf( "%s\n", header.data() );
+        std::string header = join(columns, args.separator);
+        printf("%s\n", header.data());
 
         const auto last_time = worker.GetLastTime();
-        for( auto& it : slz_selected )
+        for(auto& it : slz_selected)
         {
-            std::vector<std::string> values( columns.size() );
+            std::vector<std::string> values(columns.size());
 
-            values[0] = get_name( it->first, worker );
+            values[0] = get_name(it->first, worker);
 
-            const auto& srcloc = worker.GetSourceLocation( it->first );
-            values[1] = worker.GetString( srcloc.file );
-            values[2] = std::to_string( srcloc.line );
+            const auto& srcloc = worker.GetSourceLocation(it->first);
+            values[1] = worker.GetString(srcloc.file);
+            values[2] = std::to_string(srcloc.line);
 
             const auto& zone_data = it->second;
 
-            if( args.unwrap )
+            if (args.unwrap)
             {
                 int i = 0;
-                for( const auto& zone_thread_data : zone_data.zones )
-                {
+                for (const auto& zone_thread_data : zone_data.zones) {
                     const auto zone_event = zone_thread_data.Zone();
                     const auto tId = zone_thread_data.Thread();
                     const auto start = zone_event->Start();
                     const auto end = zone_event->End();
 
-                    values[3] = std::to_string( start );
+                    values[3] = std::to_string(start);
 
                     auto timespan = end - start;
-                    if( args.self_time )
-                    {
-                        timespan -= GetZoneChildTimeFast( worker, *zone_event );
+                    if (args.self_time) {
+                        timespan -= GetZoneChildTimeFast(worker, *zone_event);
                     }
-                    values[4] = std::to_string( timespan );
-                    values[5] = std::to_string( tId );
+                    values[4] = std::to_string(timespan);
+                    values[5] = std::to_string(tId);
 
-                    std::string row = join( values, args.separator );
-                    printf( "%s\n", row.data() );
+                    std::string row = join(values, args.separator);
+                    printf("%s\n", row.data());
                 }
             }
             else
             {
                 const auto time = args.self_time ? zone_data.selfTotal : zone_data.total;
-                values[3] = std::to_string( time );
-                values[4] = std::to_string( 100. * time / last_time );
+                values[3] = std::to_string(time);
+                values[4] = std::to_string(100. * time / last_time);
 
-                values[5] = std::to_string( zone_data.zones.size() );
+                values[5] = std::to_string(zone_data.zones.size());
 
-                const auto avg = ( args.self_time ? zone_data.selfTotal : zone_data.total ) / zone_data.zones.size();
-                values[6] = std::to_string( avg );
+                const auto avg = (args.self_time ? zone_data.selfTotal : zone_data.total)
+                    / zone_data.zones.size();
+                values[6] = std::to_string(avg);
 
                 const auto tmin = args.self_time ? zone_data.selfMin : zone_data.min;
                 const auto tmax = args.self_time ? zone_data.selfMax : zone_data.max;
-                values[7] = std::to_string( tmin );
-                values[8] = std::to_string( tmax );
+                values[7] = std::to_string(tmin);
+                values[8] = std::to_string(tmax);
 
                 const auto sz = zone_data.zones.size();
-                const auto ss = zone_data.sumSq - 2. * zone_data.total * avg + avg * avg * sz;
+                const auto ss = zone_data.sumSq
+                    - 2. * zone_data.total * avg
+                    + avg * avg * sz;
                 double std = 0;
-                if( sz > 1 ) std = sqrt( ss / ( sz - 1 ) );
-                values[9] = std::to_string( std );
+                if( sz > 1 )
+                    std = sqrt(ss / (sz - 1));
+                values[9] = std::to_string(std);
 
-                std::string row = join( values, args.separator );
-                printf( "%s\n", row.data() );
+                std::string row = join(values, args.separator);
+                printf("%s\n", row.data());
             }
         }
 
-        if( args.plot && args.unwrap )
+        if(args.plot && args.unwrap)
         {
             auto& plots = worker.GetPlots();
-            for( const auto& plot : plots )
+            for(const auto& plot : plots)
             {
-                std::vector<std::string> values( columns.size() );
-                values[0] = worker.GetString( plot->name );
+                std::vector<std::string> values(columns.size());
+                values[0] = worker.GetString(plot->name);
 
-                for( const auto& val : plot->data )
+                for(const auto& val : plot->data)
                 {
-                    if( args.unwrap )
+                    if (args.unwrap)
                     {
-                        values[3] = std::to_string( val.time.Val() );
-                        values[6] = std::to_string( val.val );
+                        values[3] = std::to_string(val.time.Val());
+                        values[6] = std::to_string(val.val);
                     }
-                    std::string row = join( values, args.separator );
-                    printf( "%s\n", row.data() );
+                    std::string row = join(values, args.separator);
+                    printf("%s\n", row.data());
                 }
             }
         }
@@ -385,19 +391,19 @@ int main(int argc, char** argv)
         gpu_slz_selected.reserve( gpu_slz.size() );
 
         uint32_t total_cnt = 0;
-        for( auto it = gpu_slz.begin(); it != gpu_slz.end(); ++it )
+        for (auto it = gpu_slz.begin(); it != gpu_slz.end(); ++it)
         {
-            if( it->second.total != 0 )
+            if (it->second.total != 0)
             {
                 ++total_cnt;
-                if( args.filter[0] == '\0' )
+                if (args.filter[0] == '\0')
                 {
                     gpu_slz_selected.push_back_no_space_check( it );
                 }
                 else
                 {
                     auto name = get_name( it->first, worker );
-                    if( is_substring( args.filter, name, args.case_sensitive ) )
+                    if (is_substring( args.filter, name, args.case_sensitive))
                     {
                         gpu_slz_selected.push_back_no_space_check( it );
                     }
@@ -406,13 +412,13 @@ int main(int argc, char** argv)
         }
 
         std::vector<const char*> columns;
-        columns = { "name", "src_file", "Time from start of program", "GPU execution time"};
+        columns = {"name", "src_file", "Time from start of program", "GPU execution time"};
 
-        std::string header = join( columns, args.separator );
-        printf( "%s\n", header.data() );
+        std::string header = join(columns, args.separator);
+        printf("%s\n", header.data());
 
         const auto last_time = worker.GetLastTime();
-        for( auto& it : gpu_slz_selected )
+        for (auto& it : gpu_slz_selected)
         {
             std::vector<std::string> values( columns.size() );
 
@@ -422,7 +428,7 @@ int main(int argc, char** argv)
             values[1] = worker.GetString( srcloc.file );
 
             const auto& zone_data = it->second;
-            for( const auto& zone_thread_data : zone_data.zones )
+            for (const auto& zone_thread_data : zone_data.zones)
             {
                 tracy::GpuEvent* gpu_event = zone_thread_data.Zone();
                 const auto start = gpu_event->GpuStart();