A little cleanup/reorg