Some cleanup to Simulator and AgentDist