a bit more clean up / reorg