cleaned up Calculation Particle and ParticleGen