slight util reorg