Some cleanup to Simualtor class. Make data JSON save configurable