Clean up Simulation.java a bit