 //ElectroStatic Calculation
 //**************************************************************//
 __device__ double CalcCoulombParticleGPU(double distSq, double qi_qj_fact,
-    double gpu_ewald, double gpu_alpha,
-    double gpu_lambdaCoulomb, bool sc_coul,
-    double sc_sigma_6, double sc_alpha,
-    uint sc_power, double gpu_sigmaSq)
+                                         double gpu_ewald, double gpu_alpha,
+                                         double gpu_lambdaCoulomb, bool sc_coul,
+                                         double sc_sigma_6, double sc_alpha,
+                                         uint sc_power, double gpu_sigmaSq)
 {
   if(gpu_lambdaCoulomb >= 0.999999) {
     return CalcCoulombParticleGPUNoLambda(distSq, qi_qj_fact, gpu_ewald, gpu_alpha);

                                         sc_power,
                                         gpu_sigmaSq[threadID],
                                         gpu_count[0]);
    }
    gpu_LJEn[threadID] = CalcEnGPU(distSq,
                                   kA,

  }
}

__device__ double CalcCoulombGPU(double distSq,
                                 int kind1,
                                 int kind2,
                                 double qi_qj_fact, 
                                 double gpu_rCutLow,
                                 int gpu_ewald,
                                 int gpu_VDW_Kind,
                                 double gpu_alpha,
                                 double gpu_rCutCoulomb,
                                 int gpu_isMartini,
                                 double gpu_diElectric_1,
                                 double gpu_lambdaCoulomb,
                                 bool sc_coul,
                                 double sc_sigma_6,
                                 double sc_alpha,
                                 uint sc_power,
                                 double gpu_sigmaSq,
                                 int gpu_count)
{
  if((gpu_rCutCoulomb * gpu_rCutCoulomb) < distSq) {
