Minor tweaks / reorg