Cleaned up the simulator object a bit.