Cleaned up the DiffusionSimulator code