Moved output functionality into Simulator class