Commenting, simplifying TrainSimulator