Slight reorg, tightening up