diff --git a/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp
index 23f8b08..d0fd3d5 100644
--- a/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp
+++ b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp
@@ -13,7 +13,8 @@
 namespace smo {
 namespace stim_buff {
 
-OpenClCollatingAndMeshingEngine::OpenClCollatingAndMeshingEngine(PcloudStimulusBuffer& parent_)
+OpenClCollatingAndMeshingEngine::OpenClCollatingAndMeshingEngine(
+	PcloudStimulusBuffer& parent_)
 : parent(parent_),
 platform(nullptr),
 device(nullptr),
@@ -238,7 +239,8 @@ void OpenClCollatingAndMeshingEngine::start(
 
 	if (isRunning)
 	{
-		std::cerr << __func__ << ": already running, call stop() first" << std::endl;
+		std::cerr << __func__ << ": already running, call stop() first"
+			<< std::endl;
 		return;
 	}
 
@@ -289,7 +291,8 @@ void OpenClCollatingAndMeshingEngine::start(
 
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to enqueue slotCompactor kernel: " << err << std::endl;
+		std::cerr << __func__ << ": failed to enqueue slotCompactor kernel: "
+			<< err << std::endl;
 		return;
 	}
 
@@ -303,7 +306,8 @@ void OpenClCollatingAndMeshingEngine::start(
 
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set event callback: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set event callback: " << err
+			<< std::endl;
 		clReleaseEvent(currentKernelEvent);
 		currentKernelEvent = nullptr;
 		return;
@@ -351,7 +355,8 @@ bool OpenClCollatingAndMeshingEngine::compileAndPrepareKernel(
 			std::vector<char> log(logSize);
 			clGetProgramBuildInfo(program, device, CL_PROGRAM_BUILD_LOG,
 				logSize, log.data(), nullptr);
-			std::cerr << kernelName << " build log: " << log.data() << std::endl;
+			std::cerr << kernelName << " build log: " << log.data()
+				<< std::endl;
 		}
 
 		return false;
@@ -406,50 +411,63 @@ bool OpenClCollatingAndMeshingEngine::setupSlotCompactorsArgs(
 	uint32_t numSlots = static_cast<uint32_t>(frameDesc->numSlots);
 	uint32_t slotStride = static_cast<uint32_t>(assemblyBuff.slotStrideNBytes);
 	uint32_t slotSize = static_cast<uint32_t>(frameDesc->slotSizeBytes);
-	uint32_t firstSlotOffset = static_cast<uint32_t>(assemblyBuff.firstSlotOffsetNBytes);
+	uint32_t firstSlotOffset = static_cast<uint32_t>(
+		assemblyBuff.firstSlotOffsetNBytes);
 	uint32_t nSucceededUint = static_cast<uint32_t>(nSucceeded);
 
 	// Set kernel arguments for slotCompactor
 	cl_int err;
-	err = clSetKernelArg(slotCompactorKernel, 0, sizeof(cl_mem), &clAssemblyBuffer);
+	err = clSetKernelArg(
+		slotCompactorKernel, 0, sizeof(cl_mem), &clAssemblyBuffer);
+
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set kernel arg 0: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set kernel arg 0: " << err
+			<< std::endl;
 		return false;
 	}
 
 	err = clSetKernelArg(slotCompactorKernel, 1, sizeof(uint32_t), &numSlots);
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set kernel arg 1: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set kernel arg 1: " << err
+			<< std::endl;
 		return false;
 	}
 
 	err = clSetKernelArg(slotCompactorKernel, 2, sizeof(uint32_t), &slotStride);
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set kernel arg 2: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set kernel arg 2: " << err
+			<< std::endl;
 		return false;
 	}
 
 	err = clSetKernelArg(slotCompactorKernel, 3, sizeof(uint32_t), &slotSize);
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set kernel arg 3: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set kernel arg 3: " << err
+			<< std::endl;
 		return false;
 	}
 
-	err = clSetKernelArg(slotCompactorKernel, 4, sizeof(uint32_t), &firstSlotOffset);
+	err = clSetKernelArg(
+		slotCompactorKernel, 4, sizeof(uint32_t), &firstSlotOffset);
+
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set kernel arg 4: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set kernel arg 4: " << err
+			<< std::endl;
 		return false;
 	}
 
-	err = clSetKernelArg(slotCompactorKernel, 5, sizeof(uint32_t), &nSucceededUint);
+	err = clSetKernelArg(
+		slotCompactorKernel, 5, sizeof(uint32_t), &nSucceededUint);
+
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set kernel arg 5: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set kernel arg 5: " << err
+			<< std::endl;
 		return false;
 	}
 
@@ -470,7 +488,8 @@ bool OpenClCollatingAndMeshingEngine::setupCollateDgramsArgs(
 
 	// Extract parameters for collateDgrams kernel
 	uint32_t slotStride = static_cast<uint32_t>(assemblyBuff.slotStrideNBytes);
-	uint32_t firstSlotOffset = static_cast<uint32_t>(assemblyBuff.firstSlotOffsetNBytes);
+	uint32_t firstSlotOffset = static_cast<uint32_t>(
+		assemblyBuff.firstSlotOffsetNBytes);
 
 	// Calculate nPointsPerSlot from device return mode
 	if (!parent.device)
@@ -488,42 +507,48 @@ bool OpenClCollatingAndMeshingEngine::setupCollateDgramsArgs(
 	err = clSetKernelArg(collateKernel, 0, sizeof(cl_mem), &clAssemblyBuffer);
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set kernel arg 0: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set kernel arg 0: " << err
+			<< std::endl;
 		return false;
 	}
 
 	err = clSetKernelArg(collateKernel, 1, sizeof(cl_mem), &clCollationBuffer);
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set kernel arg 1: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set kernel arg 1: " << err
+			<< std::endl;
 		return false;
 	}
 
 	err = clSetKernelArg(collateKernel, 2, sizeof(uint32_t), &slotStride);
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set kernel arg 2: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set kernel arg 2: " << err
+			<< std::endl;
 		return false;
 	}
 
 	err = clSetKernelArg(collateKernel, 3, sizeof(uint32_t), &firstSlotOffset);
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set kernel arg 3: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set kernel arg 3: " << err
+			<< std::endl;
 		return false;
 	}
 
 	err = clSetKernelArg(collateKernel, 4, sizeof(uint32_t), &nPointsPerSlot);
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set kernel arg 4: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set kernel arg 4: " << err
+			<< std::endl;
 		return false;
 	}
 
 	err = clSetKernelArg(collateKernel, 5, sizeof(uint32_t), &nDgramsPerFrame);
 	if (err != CL_SUCCESS)
 	{
-		std::cerr << __func__ << ": failed to set kernel arg 5: " << err << std::endl;
+		std::cerr << __func__ << ": failed to set kernel arg 5: " << err
+			<< std::endl;
 		return false;
 	}