Particles count diffusion implemented. Some needed refactoring and concomitant optimisation