Added some extra formatting to Simulation