extended SimulatorAPI interface
style
cleanup