header reorg, mostly angle brackets to quotes