Removed code repetition from Simulation