Minor cleanup/reorg