more style edits based on the simulator