 	}
 }
 
-__device__ int newFireUpdate (	int* 	fireTablePtr,
-								short int* fireGrpId,
-								volatile unsigned int& 	fireCnt,
-								volatile unsigned int& 	fireCntD1,
-								int& 	simTime)
-{
+__device__ int updateNewFirings(int* fireTablePtr, short int* fireGrpId,
+                                volatile unsigned int& fireCnt, volatile unsigned int& fireCntD1, int& simTime) {
 __shared__ volatile unsigned int cntD2;
 __shared__ volatile unsigned int cntD1;
 __shared__ volatile int blkErrCode;

		int grpBufCnt = (int) ceil(1.0f * groupConfig[g].SizeN / bufSize);
		assert(grpBufCnt>=0);
		bufferCnt += grpBufCnt;
		KERNEL_DEBUG("Grp Size = %d, Total Buffer Cnt = %d, Buffer Cnt = %f", groupConfig[g].SizeN, bufferCnt, grpBufCnt);
	}
	assert(bufferCnt>0);



	// few more fired neurons are left. we update their firing state here..
	if (fireCnt) {
		int retCode = updateNewFirings(fireTable, fireGrpId, fireCnt, fireCntD1, simTime);
		if (retCode != 0) return;

		if (networkConfigGPU.sim_with_stdp && !networkConfigGPU.sim_in_testing)
