Integrate Meghan's suggestions from latest pass