Refactor of class Simulation