Cleans up the simulation creation code