Simplify Simulation.cpp by using members